Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🗃️ refactor: Remove Dead Data Schemas Methods and Data Provider Exports (#17113)

Marco Berettae2b2839375d5
diff --git a/api/app/clients/specs/BaseClient.test.js b/api/app/clients/specs/BaseClient.test.js
index cd6ac2c34f..0e36ec116f 100644
--- a/api/app/clients/specs/BaseClient.test.js
+++ b/api/app/clients/specs/BaseClient.test.js
@@ -41,14 +41,12 @@ jest.mock('~/models', () => ({
getMessages: jest.fn().mockResolvedValue([]),
saveMessage: jest.fn(),
updateMessage: jest.fn(),
- deleteMessagesSince: jest.fn(),
deleteMessages: jest.fn(),
getConvoTitle: jest.fn(),
getConvo: jest.fn(),
saveConvo: jest.fn(),
stampConvoLastResponse: jest.fn(),
deleteConvos: jest.fn(),
- getPreset: jest.fn(),
getPresets: jest.fn(),
savePreset: jest.fn(),
deletePresets: jest.fn(),
diff --git a/api/server/services/twoFactorService.spec.js b/api/server/services/twoFactorService.spec.js
index 5d46e03765..f882de977b 100644
--- a/api/server/services/twoFactorService.spec.js
+++ b/api/server/services/twoFactorService.spec.js
@@ -9,7 +9,6 @@ jest.mock('node:crypto', () => {
});
jest.mock('@librechat/data-schemas', () => ({
- hashBackupCode: jest.fn(),
decryptV3: jest.fn(),
decryptV2: jest.fn(),
}));
diff --git a/bun.lock b/bun.lock
index 875e4b24c9..3214d6c35d 100644
--- a/bun.lock
+++ b/bun.lock
@@ -500,10 +500,6 @@
"@babel/preset-env": "^7.21.5",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.0",
- "@rollup/plugin-alias": "^5.1.0",
- "@rollup/plugin-commonjs": "^29.0.0",
- "@rollup/plugin-json": "^6.1.0",
- "@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-replace": "^5.0.5",
"@types/jest": "^29.5.2",
"@types/js-yaml": "^4.0.9",
@@ -536,14 +532,12 @@
"micromark-util-decode-string": "^2.0.0",
},
"devDependencies": {
- "@types/express": "^5.0.0",
"@types/jest": "^29.5.2",
"@types/node": "^24.12.4",
"jest": "^30.2.0",
"jest-junit": "^17.0.0",
"mongodb-memory-server": "^11.0.1",
"rimraf": "^6.1.3",
- "ts-node": "^10.9.2",
"tsdown": "^0.22.2",
"typescript": "^5.9.3",
},
@@ -1900,17 +1894,13 @@
"@rolldown/pluginutils": ["@rolldown/[email protected]", "", {}, "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw=="],
- "@rollup/plugin-alias": ["@rollup/[email protected]", "", { "dependencies": { "slash": "^4.0.0" }, "peerDependencies": { "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" } }, "sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ=="],
"@rollup/plugin-babel": ["@rollup/[email protected]", "", { "dependencies": { "@babel/helper-module-imports": "^7.18.6", "@rollup/pluginutils": "^5.0.1" }, "peerDependencies": { "@babel/core": "^7.0.0", "@types/babel__core": "^7.1.9", "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" }, "optionalPeers": ["@types/babel__core", "rollup"] }, "sha512-dFZNuFD2YRcoomP4oYf+DvQNSUA9ih+A3vUqopQx5EdtPGo3WBnQcI/S8pwpz91UsGfL0HsMSOlaMld8HrbubA=="],
- "@rollup/plugin-commonjs": ["@rollup/[email protected]", "", { "dependencies": { "@rollup/pluginutils": "^5.0.1", "commondir": "^1.0.1", "estree-walker": "^2.0.2", "fdir": "^6.2.0", "is-reference": "1.2.1", "magic-string": "^0.30.3", "picomatch": "^4.0.2" }, "peerDependencies": { "rollup": "^2.68.0||^3.0.0||^4.0.0" } }, "sha512-U2YHaxR2cU/yAiwKJtJRhnyLk7cifnQw0zUpISsocBDoHDJn+HTV74ABqnwr5bEgWUwFZC9oFL6wLe21lHu5eQ=="],
"@rollup/plugin-inject": ["@rollup/[email protected]", "", { "dependencies": { "@rollup/pluginutils": "^5.0.1", "estree-walker": "^2.0.2", "magic-string": "^0.30.3" }, "peerDependencies": { "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" } }, "sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg=="],
- "@rollup/plugin-json": ["@rollup/[email protected]", "", { "dependencies": { "@rollup/pluginutils": "^5.1.0" }, "peerDependencies": { "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" } }, "sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA=="],
- "@rollup/plugin-node-resolve": ["@rollup/[email protected]", "", { "dependencies": { "@rollup/pluginutils": "^5.0.1", "@types/resolve": "1.20.2", "deepmerge": "^4.2.2", "is-builtin-module": "^3.2.1", "is-module": "^1.0.0", "resolve": "^1.22.1" }, "peerDependencies": { "rollup": "^2.78.0||^3.0.0||^4.0.0" } }, "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ=="],
"@rollup/plugin-replace": ["@rollup/[email protected]", "", { "dependencies": { "@rollup/pluginutils": "^5.0.1", "magic-string": "^0.30.3" }, "peerDependencies": { "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" } }, "sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ=="],
@@ -5850,13 +5840,10 @@
"@radix-ui/react-use-size/@radix-ui/react-use-layout-effect": ["@radix-ui/[email protected]", "", { "dependencies": { "@babel/runtime": "^7.13.10" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0" } }, "sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ=="],
- "@rollup/plugin-alias/slash": ["[email protected]", "", {}, "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="],
"@rollup/plugin-babel/@babel/helper-module-imports": ["@babel/[email protected]", "", { "dependencies": { "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g=="],
- "@rollup/plugin-commonjs/picomatch": ["[email protected]", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="],
- "@rollup/plugin-node-resolve/resolve": ["[email protected]", "", { "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": "bin/resolve" }, "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="],
"@rollup/pluginutils/picomatch": ["[email protected]", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
diff --git a/package-lock.json b/package-lock.json
index 4216a60fab..79c659ff32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15051,26 +15051,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/@rollup/plugin-alias": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz",
- "integrity": "sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==",
- "dev": true,
- "dependencies": {
- "slash": "^4.0.0"
- },
- "engines": {
- "node": ">=14.0.0"
- },
- "peerDependencies": {
- "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
- },
- "peerDependenciesMeta": {
- "rollup": {
- "optional": true
- }
- }
- },
"node_modules/@rollup/plugin-babel": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-6.1.0.tgz",
@@ -15098,64 +15078,6 @@
}
}
},
- "node_modules/@rollup/plugin-commonjs": {
- "version": "29.0.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-29.0.0.tgz",
- "integrity": "sha512-U2YHaxR2cU/yAiwKJtJRhnyLk7cifnQw0zUpISsocBDoHDJn+HTV74ABqnwr5bEgWUwFZC9oFL6wLe21lHu5eQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@rollup/pluginutils": "^5.0.1",
- "commondir": "^1.0.1",
- "estree-walker": "^2.0.2",
- "fdir": "^6.2.0",
- "is-reference": "1.2.1",
- "magic-string": "^0.30.3",
- "picomatch": "^4.0.2"
- },
- "engines": {
- "node": ">=16.0.0 || 14 >= 14.17"
- },
- "peerDependencies": {
- "rollup": "^2.68.0||^3.0.0||^4.0.0"
- },
- "peerDependenciesMeta": {
- "rollup": {
- "optional": true
- }
- }
- },
- "node_modules/@rollup/plugin-commonjs/node_modules/fdir": {
- "version": "6.5.0",
- "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
- "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12.0.0"
- },
- "peerDependencies": {
- "picomatch": "^3 || ^4"
- },
- "peerDependenciesMeta": {
- "picomatch": {
- "optional": true
- }
- }
- },
- "node_modules/@rollup/plugin-commonjs/node_modules/picomatch": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
- "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/jonschlinkert"
- }
- },
"node_modules/@rollup/plugin-inject": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz",
@@ -15179,51 +15101,6 @@
}
}
},
- "node_modules/@rollup/plugin-json": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.1.0.tgz",
- "integrity": "sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==",
- "dev": true,
- "dependencies": {
- "@rollup/pluginutils": "^5.1.0"
- },
- "engines": {
- "node": ">=14.0.0"
- },
- "peerDependencies": {
- "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
- },
- "peerDependenciesMeta": {
- "rollup": {
- "optional": true
- }
- }
- },
- "node_modules/@rollup/plugin-node-resolve": {
- "version": "15.2.3",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
- "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
- "dev": true,
- "dependencies": {
- "@rollup/pluginutils": "^5.0.1",
- "@types/resolve": "1.20.2",
- "deepmerge": "^4.2.2",
- "is-builtin-module": "^3.2.1",
- "is-module": "^1.0.0",
- "resolve": "^1.22.1"
- },
- "engines": {
- "node": ">=14.0.0"
- },
- "peerDependencies": {
- "rollup": "^2.78.0||^3.0.0||^4.0.0"
- },
- "peerDependenciesMeta": {
- "rollup": {
- "optional": true
- }
- }
- },
"node_modules/@rollup/plugin-replace": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.5.tgz",
@@ -20902,18 +20779,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/builtin-modules": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
- "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
- "dev": true,
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/builtin-status-codes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -26746,21 +26611,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/is-builtin-module": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
- "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
- "dev": true,
- "dependencies": {
- "builtin-modules": "^3.3.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/is-bun-module": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz",
@@ -27063,15 +26913,6 @@
"integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
"license": "MIT"
},
- "node_modules/is-reference": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
- "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
- "dev": true,
- "dependencies": {
- "@types/estree": "*"
- }
- },
"node_modules/is-regex": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
@@ -37101,18 +36942,6 @@
"node": ">=0.3.1"
}
},
- "node_modules/slash": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
- "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
- "dev": true,
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/slice-ansi": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
@@ -43254,10 +43083,6 @@
"@babel/preset-env": "^7.21.5",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.0",
- "@rollup/plugin-alias": "^5.1.0",
- "@rollup/plugin-commonjs": "^29.0.0",
- "@rollup/plugin-json": "^6.1.0",
- "@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-replace": "^5.0.5",
"@types/jest": "^29.5.2",
"@types/js-yaml": "^4.0.9",
@@ -43863,14 +43688,12 @@
"micromark-util-decode-string": "^2.0.0"
},
"devDependencies": {
- "@types/express": "^5.0.0",
"@types/jest": "^29.5.2",
"@types/node": "^24.12.4",
"jest": "^30.2.0",
"jest-junit": "^17.0.0",
"mongodb-memory-server": "^11.0.1",
"rimraf": "^6.1.3",
- "ts-node": "^10.9.2",
"tsdown": "^0.22.2",
"typescript": "^5.9.3"
},
diff --git a/packages/api/src/crypto/index.ts b/packages/api/src/crypto/index.ts
index 3b265a71f0..37d4ed671a 100644
--- a/packages/api/src/crypto/index.ts
+++ b/packages/api/src/crypto/index.ts
@@ -5,7 +5,6 @@ export {
decryptV2,
encryptV3,
decryptV3,
- hashBackupCode,
getRandomValues,
} from '@librechat/data-schemas';
export * from './jwt';
diff --git a/packages/api/src/schedules/handlers.spec.ts b/packages/api/src/schedules/handlers.spec.ts
index 59d081a275..85829da2cf 100644
--- a/packages/api/src/schedules/handlers.spec.ts
+++ b/packages/api/src/schedules/handlers.spec.ts
@@ -179,7 +179,6 @@ function makeCreateDeps(over: Partial<SchedulesHandlersDeps> = {}): SchedulesHan
createScheduleWithSlot: jest.fn(async (data: Partial<ISchedule>) => data as ISchedule),
getScheduleByClientRequestId: jest.fn(async () => null),
getScheduleById: jest.fn(async () => null),
- deleteScheduleById: jest.fn(async () => true),
deleteUnarmedSchedule: jest.fn(async () => 'deleted'),
markScheduleDeleting: jest.fn(async () => ({ id: 'sched-1' }) as ISchedule),
updateScheduleById: jest.fn(async () => ({ id: 'sched-1' }) as ISchedule),
@@ -225,7 +224,6 @@ describe('createSchedule late-create compensation', () => {
'user-1',
0,
);
- expect(deps.methods.deleteScheduleById).not.toHaveBeenCalled();
expect(deps.methods.markScheduleDeleting).not.toHaveBeenCalled();
expect(captured.status).toBe(410);
});
@@ -271,7 +269,6 @@ describe('createSchedule late-create compensation', () => {
*/
it('never inserts an armed row, so a failed compensation leaves an inert one', async () => {
const deps = makeCreateDeps();
- (deps.methods.deleteScheduleById as jest.Mock).mockRejectedValue(new Error('mongo down'));
(deps.methods.markScheduleDeleting as jest.Mock).mockRejectedValue(new Error('mongo down'));
const { res } = makeRes();
await createSchedulesHandlers(deps).createSchedule(makeCreateReq(), res);
@@ -377,7 +374,6 @@ describe('createSchedule late-create compensation', () => {
'user-1',
0,
);
- expect(deps.methods.deleteScheduleById).not.toHaveBeenCalled();
});
it('answers 201 instead of deleting when the ambiguous arm actually committed', async () => {
@@ -619,7 +615,6 @@ describe('create idempotency', () => {
expect(deps.methods.armSchedule).not.toHaveBeenCalled();
expect(deps.methods.updateScheduleById).not.toHaveBeenCalled();
expect(deps.methods.deleteUnarmedSchedule).not.toHaveBeenCalled();
- expect(deps.methods.deleteScheduleById).not.toHaveBeenCalled();
});
/**
@@ -726,7 +721,6 @@ describe('create idempotency', () => {
// The established row survives for the next retry; deleting it here is data loss.
expect(captured.status).toBe(500);
- expect(deps.methods.deleteScheduleById).not.toHaveBeenCalled();
expect(deps.methods.deleteUnarmedSchedule).not.toHaveBeenCalled();
expect(deps.methods.markScheduleDeleting).not.toHaveBeenCalled();
});
diff --git a/packages/data-provider/.gitignore b/packages/data-provider/.gitignore
index 7b961825b3..c2658d7d1b 100644
--- a/packages/data-provider/.gitignore
+++ b/packages/data-provider/.gitignore
@@ -1,2 +1 @@
node_modules/
-test_bundle/
diff --git a/packages/data-provider/package.json b/packages/data-provider/package.json
index 16bdb22c48..7c6f68ae81 100644
--- a/packages/data-provider/package.json
+++ b/packages/data-provider/package.json
@@ -25,7 +25,6 @@
"clean": "rimraf dist",
"build": "npm run clean && tsdown && tsc -p tsconfig.build.json",
"build:watch": "tsdown --watch",
- "rollup:api": "npx rollup -c server-rollup.config.js --bundleConfigAsCjs",
"test": "jest --coverage --watch",
"test:ci": "jest --coverage --ci --logHeapUsage",
"verify": "npm run test:ci",
@@ -54,10 +53,6 @@
"@babel/preset-env": "^7.21.5",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.0",
- "@rollup/plugin-alias": "^5.1.0",
- "@rollup/plugin-commonjs": "^29.0.0",
- "@rollup/plugin-json": "^6.1.0",
- "@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-replace": "^5.0.5",
"@types/jest": "^29.5.2",
"@types/js-yaml": "^4.0.9",
diff --git a/packages/data-provider/react-query/package-lock.json b/packages/data-provider/react-query/package-lock.json
deleted file mode 100644
index 1dbd006cee..0000000000
--- a/packages/data-provider/react-query/package-lock.json
+++ /dev/null
@@ -1,344 +0,0 @@
-{
- "name": "librechat-data-provider/react-query",
- "lockfileVersion": 3,
- "requires": true,
- "packages": {
- "": {
- "name": "librechat-data-provider/react-query",
- "dependencies": {
- "axios": "^1.20.0"
- }
- },
- "node_modules/agent-base": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
- "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
- "license": "MIT",
- "dependencies": {
- "debug": "4"
- },
- "engines": {
- "node": ">= 6.0.0"
- }
- },
- "node_modules/asynckit": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
- "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
- "license": "MIT"
- },
- "node_modules/axios": {
- "version": "1.20.0",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.20.0.tgz",
- "integrity": "sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==",
- "license": "MIT",
- "dependencies": {
- "follow-redirects": "^1.16.0",
- "form-data": "^4.0.6",
- "https-proxy-agent": "^5.0.1",
- "proxy-from-env": "^2.1.0"
- }
- },
- "node_modules/call-bind-apply-helpers": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
- "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
- "license": "MIT",
- "dependencies": {
- "es-errors": "^1.3.0",
- "function-bind": "^1.1.2"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/combined-stream": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
- "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
- "license": "MIT",
- "dependencies": {
- "delayed-stream": "~1.0.0"
- },
- "engines": {
- "node": ">= 0.8"
- }
- },
- "node_modules/debug": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
- "license": "MIT",
- "dependencies": {
- "ms": "^2.1.3"
- },
- "engines": {
- "node": ">=6.0"
- },
- "peerDependenciesMeta": {
- "supports-color": {
- "optional": true
- }
- }
- },
- "node_modules/delayed-stream": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
- "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
- "license": "MIT",
- "engines": {
- "node": ">=0.4.0"
- }
- },
- "node_modules/dunder-proto": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
- "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
- "license": "MIT",
- "dependencies": {
- "call-bind-apply-helpers": "^1.0.1",
- "es-errors": "^1.3.0",
- "gopd": "^1.2.0"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/es-define-property": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
- "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/es-errors": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
- "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/es-object-atoms": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
- "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
- "license": "MIT",
- "dependencies": {
- "es-errors": "^1.3.0"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/es-set-tostringtag": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
- "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
- "license": "MIT",
- "dependencies": {
- "es-errors": "^1.3.0",
- "get-intrinsic": "^1.2.6",
- "has-tostringtag": "^1.0.2",
- "hasown": "^2.0.2"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/follow-redirects": {
- "version": "1.16.0",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
- "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
- "funding": [
- {
- "type": "individual",
- "url": "https://github.com/sponsors/RubenVerborgh"
- }
- ],
- "license": "MIT",
- "engines": {
- "node": ">=4.0"
- },
- "peerDependenciesMeta": {
- "debug": {
- "optional": true
- }
- }
- },
- "node_modules/form-data": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
- "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
- "license": "MIT",
- "dependencies": {
- "asynckit": "^0.4.0",
- "combined-stream": "^1.0.8",
- "es-set-tostringtag": "^2.1.0",
- "hasown": "^2.0.4",
- "mime-types": "^2.1.35"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/function-bind": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
- "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
- "license": "MIT",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/get-intrinsic": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
- "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
- "license": "MIT",
- "dependencies": {
- "call-bind-apply-helpers": "^1.0.2",
- "es-define-property": "^1.0.1",
- "es-errors": "^1.3.0",
- "es-object-atoms": "^1.1.1",
- "function-bind": "^1.1.2",
- "get-proto": "^1.0.1",
- "gopd": "^1.2.0",
- "has-symbols": "^1.1.0",
- "hasown": "^2.0.2",
- "math-intrinsics": "^1.1.0"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/get-proto": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
- "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
- "license": "MIT",
- "dependencies": {
- "dunder-proto": "^1.0.1",
- "es-object-atoms": "^1.0.0"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/gopd": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
- "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/has-symbols": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
- "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/has-tostringtag": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
- "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
- "license": "MIT",
- "dependencies": {
- "has-symbols": "^1.0.3"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/hasown": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
- "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
- "license": "MIT",
- "dependencies": {
- "function-bind": "^1.1.2"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/https-proxy-agent": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
- "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
- "license": "MIT",
- "dependencies": {
- "agent-base": "6",
- "debug": "4"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/math-intrinsics": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
- "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/mime-db": {
- "version": "1.52.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
- "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/mime-types": {
- "version": "2.1.35",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
- "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
- "license": "MIT",
- "dependencies": {
- "mime-db": "1.52.0"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/ms": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
- "license": "MIT"
- },
- "node_modules/proxy-from-env": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
- "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
- "license": "MIT",
- "engines": {
- "node": ">=10"
- }
- }
- }
-}
diff --git a/packages/data-provider/react-query/package.json b/packages/data-provider/react-query/package.json
deleted file mode 100644
index 148effa2f2..0000000000
--- a/packages/data-provider/react-query/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "name": "librechat-data-provider/react-query",
- "private": true,
- "main": "../index.js",
- "module": "./index.es.js",
- "types": "../dist/types/react-query/index.d.ts",
- "dependencies": {
- "axios": "^1.20.0"
- },
- "overrides": {
- "form-data": "^4.0.6"
- }
-}
diff --git a/packages/data-provider/server-rollup.config.js b/packages/data-provider/server-rollup.config.js
deleted file mode 100644
index ef17e41370..0000000000
--- a/packages/data-provider/server-rollup.config.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import path from 'path';
-import resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
-import alias from '@rollup/plugin-alias';
-import json from '@rollup/plugin-json';
-
-const rootPath = path.resolve(__dirname, '../../');
-const rootServerPath = path.resolve(__dirname, '../../api');
-const entryPath = path.resolve(rootPath, 'api/server/index.js');
-
-console.log('entryPath', entryPath);
-
-// Define custom aliases here
-const customAliases = {
- entries: [{ find: '~', replacement: rootServerPath }],
-};
-
-export default {
- input: entryPath,
- output: {
- dir: 'test_bundle',
- format: 'es',
- },
- plugins: [
- alias(customAliases),
- resolve({
- preferBuiltins: true,
- extensions: ['.js', '.json', '.node'],
- }),
- commonjs(),
- json(),
- ],
- external: (id) => {
- // More selective external function
- if (/node_modules/.test(id)) {
- return !id.startsWith('langchain/');
- }
- return false;
- },
-};
diff --git a/packages/data-provider/specs/azure.spec.ts b/packages/data-provider/specs/azure.spec.ts
index 5628d3f24b..9f35f0b904 100644
--- a/packages/data-provider/specs/azure.spec.ts
+++ b/packages/data-provider/specs/azure.spec.ts
@@ -1,5 +1,5 @@
import type { TAzureGroups } from '../src/config';
-import { validateAzureGroups, mapModelToAzureConfig, mapGroupToAzureConfig } from '../src/azure';
+import { validateAzureGroups, mapModelToAzureConfig } from '../src/azure';
describe('validateAzureGroups', () => {
it('should validate a correct configuration', () => {
@@ -788,57 +788,3 @@ describe('validateAzureGroups with modelGroupMap and groupMap', () => {
});
});
});
-
-describe('mapGroupToAzureConfig', () => {
- // Test setup for a basic config with 2 groups
- const groupMap = {
- group1: {
- apiKey: 'key-for-group1',
- instanceName: 'instance-group1',
- models: {
- model1: { deploymentName: 'deployment1', version: '1.0' },
- },
- },
- group2: {
- apiKey: 'key-for-group2',
- instanceName: 'instance-group2',
- serverless: true,
- baseURL: 'https://group2.example.com',
- models: {
- model2: true, // demonstrating a boolean style model configuration
- },
- },
- };
-
- it('should successfully map non-serverless group configuration', () => {
- const groupName = 'group1';
- const result = mapGroupToAzureConfig({ groupName, groupMap });
- expect(result).toEqual({
- azureOptions: expect.objectContaining({
- azureOpenAIApiKey: 'key-for-group1',
- azureOpenAIApiInstanceName: 'instance-group1',
- azureOpenAIApiDeploymentName: expect.any(String),
- azureOpenAIApiVersion: expect.any(String),
- }),
- });
- });
-
- it('should successfully map serverless group configuration', () => {
- const groupName = 'group2';
- const result = mapGroupToAzureConfig({ groupName, groupMap });
- expect(result).toEqual({
- azureOptions: expect.objectContaining({
- azureOpenAIApiKey: 'key-for-group2',
- }),
- baseURL: 'https://group2.example.com',
- serverless: true,
- });
- });
-
- it('should throw error for nonexistent group name', () => {
- const groupName = 'nonexistent-group';
- expect(() => {
- mapGroupToAzureConfig({ groupName, groupMap });
- }).toThrow(`Group named "${groupName}" not found in configuration.`);
- });
-});
diff --git a/packages/data-provider/specs/grok.spec.ts b/packages/data-provider/specs/grok.spec.ts
index 7bd76d669b..ae320efa92 100644
--- a/packages/data-provider/specs/grok.spec.ts
+++ b/packages/data-provider/specs/grok.spec.ts
@@ -1,14 +1,13 @@
import { EModelEndpoint, ReasoningEffort } from '../src/schemas';
-import { defaultModels, validateVisionModel } from '../src/config';
+import { defaultModels } from '../src/config';
import { applyModelAwareDefaults, paramSettings } from '../src/parameterSettings';
const settings = paramSettings[EModelEndpoint.custom]!;
describe('Grok 4.7 through existing endpoints', () => {
it.each(['grok-4.7', 'x-ai/grok-4.7', 'xai/grok-4.7', 'grok-4-7'])(
- 'enables image input and supported reasoning choices for %s',
+ 'enables supported reasoning choices for %s',
(model) => {
- expect(validateVisionModel({ model })).toBe(true);
const resolved = applyModelAwareDefaults(settings, EModelEndpoint.custom, model);
const reasoning = resolved.find((setting) => setting.key === 'reasoning_effort');
expect(reasoning?.options).toEqual([
@@ -22,10 +21,6 @@ describe('Grok 4.7 through existing endpoints', () => {
},
);
- it('preserves availability restrictions for image input', () => {
- expect(validateVisionModel({ model: 'grok-4.7', availableModels: ['grok-3'] })).toBe(false);
- });
-
it('does not change other models or mutate the shared settings', () => {
const before = settings.find((setting) => setting.key === 'reasoning_effort')?.options;
applyModelAwareDefaults(settings, EModelEndpoint.custom, 'grok-4.7');
diff --git a/packages/data-provider/specs/providers.spec.ts b/packages/data-provider/specs/providers.spec.ts
index da4bc97f2c..b7b44d16be 100644
--- a/packages/data-provider/specs/providers.spec.ts
+++ b/packages/data-provider/specs/providers.spec.ts
@@ -3,10 +3,8 @@ import {
resolveProviderId,
resolveModelCatalogKey,
endpointToProvider,
- knownEndpointToProvider,
} from '../src/providers';
import { EModelEndpoint, Providers } from '../src/schemas';
-import { KnownEndpoints } from '../src/config';
describe('ProviderId', () => {
it('declares every value as its own lowercase key', () => {
@@ -73,13 +71,6 @@ describe('mapping tables', () => {
expect(endpointToProvider[EModelEndpoint.azureAssistants]).toBeUndefined();
expect(endpointToProvider[EModelEndpoint.custom]).toBeUndefined();
});
-
- it('covers every KnownEndpoints value', () => {
- for (const known of Object.values(KnownEndpoints)) {
- expect(knownEndpointToProvider[known]).toBeDefined();
- }
- expect(knownEndpointToProvider[KnownEndpoints['together.ai']]).toBe(ProviderId.together);
- });
});
describe('resolveModelCatalogKey', () => {
diff --git a/packages/data-provider/specs/utils.spec.ts b/packages/data-provider/specs/utils.spec.ts
index 20b5686ec1..e22d313d1a 100644
--- a/packages/data-provider/specs/utils.spec.ts
+++ b/packages/data-provider/specs/utils.spec.ts
@@ -41,15 +41,6 @@ describe('Environment Variable Extraction', () => {
test('should handle strings without variable format', () => {
expect(extractEnvVariable('no_var_here')).toBe('no_var_here');
});
-
- /** No longer the expected behavior; keeping for reference */
- test.skip('should not process multiple variable formats', () => {
- process.env.FIRST_VAR = 'first';
- process.env.SECOND_VAR = 'second';
- expect(extractEnvVariable('${FIRST_VAR} and ${SECOND_VAR}')).toBe(
- '${FIRST_VAR} and ${SECOND_VAR}',
- );
- });
});
describe('extractEnvVariable function', () => {
diff --git a/packages/data-provider/src/accessPermissions.ts b/packages/data-provider/src/accessPermissions.ts
index b59bb7a8c5..7159b9ceeb 100644
--- a/packages/data-provider/src/accessPermissions.ts
+++ b/packages/data-provider/src/accessPermissions.ts
@@ -29,16 +29,6 @@ export enum PrincipalModel {
ROLE = 'Role',
}
-/**
- * Source of the principal (local LibreChat or external Entra ID)
- */
-export type TPrincipalSource = 'local' | 'entra';
-
-/**
- * Access levels for agents
- */
-export type TAccessLevel = 'none' | 'viewer' | 'editor' | 'owner';
-
/**
* Resource types for permission system
*/
@@ -125,30 +115,6 @@ export const accessRoleSchema = z.object({
permBits: z.number(),
});
-/**
- * Permission entry schema - represents a single ACL entry
- */
-export const permissionEntrySchema = z.object({
- id: z.string(),
- principalType: z.nativeEnum(PrincipalType),
- principalId: z.string().optional(), // undefined for 'public'
- principalName: z.string().optional(),
- role: accessRoleSchema,
- grantedBy: z.string(),
- grantedAt: z.string(), // ISO date string
- inheritedFrom: z.string().optional(), // for project-level inheritance
- source: z.enum(['local', 'entra']).optional(),
-});
-
-/**
- * Resource permissions response schema
- */
-export const resourcePermissionsResponseSchema = z.object({
- resourceType: z.nativeEnum(ResourceType),
- resourceId: z.string(),
- permissions: z.array(permissionEntrySchema),
-});
-
/**
* Update resource permissions request schema
* This matches the user's requirement for the frontend DTO structure
@@ -185,16 +151,6 @@ export type TPrincipal = z.infer<typeof principalSchema>;
*/
export type TAccessRole = z.infer<typeof accessRoleSchema>;
-/**
- * Permission entry - represents a single ACL entry
- */
-export type TPermissionEntry = z.infer<typeof permissionEntrySchema>;
-
-/**
- * Resource permissions response
- */
-export type TResourcePermissionsResponse = z.infer<typeof resourcePermissionsResponseSchema>;
-
/**
* Update resource permissions request
* This matches the user's requirement for the frontend DTO structure
@@ -211,15 +167,6 @@ export type TUpdateResourcePermissionsResponse = z.infer<
typeof updateResourcePermissionsResponseSchema
>;
-/**
- * Principal search request parameters
- */
-export type TPrincipalSearchParams = {
- q: string;
- limit?: number;
- types?: Array<PrincipalType.USER | PrincipalType.GROUP | PrincipalType.ROLE>;
-};
-
/**
* Principal search result item
*/
@@ -253,14 +200,6 @@ export type TPrincipalSearchResponse = {
};
};
-/**
- * Available roles response
- */
-export type TAvailableRolesResponse = {
- resourceType: ResourceType;
- roles: TAccessRole[];
-};
-
/**
* Get resource permissions response schema
* This matches the enhanced aggregation-based endpoint response format
@@ -299,66 +238,8 @@ export type TEffectivePermissionsResponse = z.infer<typeof effectivePermissionsR
*/
export type TAllEffectivePermissionsResponse = Record<string, number>;
-// ===== UTILITY TYPES =====
-
-/**
- * Permission check result
- */
-export interface TPermissionCheck {
- canView: boolean;
- canEdit: boolean;
- canDelete: boolean;
- canShare: boolean;
- accessLevel: TAccessLevel;
-}
-
// ===== HELPER FUNCTIONS =====
-/**
- * Convert permission bits to access level
- */
-export function permBitsToAccessLevel(permBits: number): TAccessLevel {
- if ((permBits & PermissionBits.DELETE) > 0) return 'owner';
- if ((permBits & PermissionBits.EDIT) > 0) return 'editor';
- if ((permBits & PermissionBits.VIEW) > 0) return 'viewer';
- return 'none';
-}
-
-/**
- * Convert access role ID to permission bits
- */
-export function accessRoleToPermBits(accessRoleId: string): number {
- switch (accessRoleId) {
- case AccessRoleIds.AGENT_VIEWER:
- case AccessRoleIds.CODE_ENVIRONMENT_VIEWER:
- case AccessRoleIds.PROMPTGROUP_VIEWER:
- case AccessRoleIds.MCPSERVER_VIEWER:
- case AccessRoleIds.REMOTE_AGENT_VIEWER:
- case AccessRoleIds.SKILL_VIEWER:
- case AccessRoleIds.SHARED_LINK_VIEWER:
- return PermissionBits.VIEW;
- case AccessRoleIds.AGENT_EDITOR:
- case AccessRoleIds.CODE_ENVIRONMENT_EDITOR:
- case AccessRoleIds.PROMPTGROUP_EDITOR:
- case AccessRoleIds.MCPSERVER_EDITOR:
- case AccessRoleIds.REMOTE_AGENT_EDITOR:
- case AccessRoleIds.SKILL_EDITOR:
- return PermissionBits.VIEW | PermissionBits.EDIT;
- case AccessRoleIds.AGENT_OWNER:
- case AccessRoleIds.CODE_ENVIRONMENT_OWNER:
- case AccessRoleIds.PROMPTGROUP_OWNER:
- case AccessRoleIds.MCPSERVER_OWNER:
- case AccessRoleIds.REMOTE_AGENT_OWNER:
- case AccessRoleIds.SKILL_OWNER:
- case AccessRoleIds.SHARED_LINK_OWNER:
- return (
- PermissionBits.VIEW | PermissionBits.EDIT | PermissionBits.DELETE | PermissionBits.SHARE
- );
- default:
- return PermissionBits.VIEW;
- }
-}
-
/**
* Check if permission bitmask contains other bitmask
* @param permissions - The permission bitmask to check
diff --git a/packages/data-provider/src/api-endpoints.ts b/packages/data-provider/src/api-endpoints.ts
index a06d908ed3..84c45ca04a 100644
--- a/packages/data-provider/src/api-endpoints.ts
+++ b/packages/data-provider/src/api-endpoints.ts
@@ -240,18 +240,12 @@ export const reasoningCapabilities = (endpoint: string) =>
export const models = () => `${BASE_URL}/api/models`;
-export const tokenizer = () => `${BASE_URL}/api/tokenizer`;
-
export const login = () => `${BASE_URL}/api/auth/login`;
export const logout = () => `${BASE_URL}/api/auth/logout`;
export const register = () => `${BASE_URL}/api/auth/register`;
-export const loginFacebook = () => `${BASE_URL}/api/auth/facebook`;
-
-export const loginGoogle = () => `${BASE_URL}/api/auth/google`;
-
export const refreshToken = (retry?: boolean) =>
`${BASE_URL}/api/auth/refresh${retry === true ? '?retry=true' : ''}`;
@@ -297,13 +291,9 @@ export function buildLoginRedirectUrl(pathname?: string, search?: string, hash?:
export const resendVerificationEmail = () => `${BASE_URL}/api/user/verify/resend`;
-export const plugins = () => `${BASE_URL}/api/plugins`;
-
export const mcpReinitialize = (serverName: string) =>
`${BASE_URL}/api/mcp/${serverName}/reinitialize`;
export const mcpConnectionStatus = () => `${BASE_URL}/api/mcp/connection/status`;
-export const mcpServerConnectionStatus = (serverName: string) =>
- `${BASE_URL}/api/mcp/connection/status/${serverName}`;
export const mcpAuthValues = (serverName: string) => {
return `${BASE_URL}/api/mcp/${serverName}/auth-values`;
};
@@ -605,11 +595,6 @@ export const updateSkillPermissions = (roleName: string) => `${getRole(roleName)
export const conversationTags = (tag?: string) =>
`${BASE_URL}/api/tags${tag != null && tag ? `/${encodeURIComponent(tag)}` : ''}`;
-export const conversationTagsList = (pageNumber: string, sort?: string, order?: string) =>
- `${conversationTags()}/list?pageNumber=${pageNumber}${sort ? `&sort=${sort}` : ''}${
- order ? `&order=${order}` : ''
- }`;
-
export const addTagToConversation = (conversationId: string) =>
`${conversationTags()}/convo/${conversationId}`;
diff --git a/packages/data-provider/src/artifacts.ts b/packages/data-provider/src/artifacts.ts
index 95cf25b6e8..59831a7253 100644
--- a/packages/data-provider/src/artifacts.ts
+++ b/packages/data-provider/src/artifacts.ts
@@ -3086,19 +3086,3 @@ export const shadcnComponents = {
tooltip: tooltip,
useToast: useToast,
};
-
-export const essentialShadcnComponents = {
- utils: utils,
- avatar: avatar,
- button: button,
- card: card,
- checkbox: checkbox,
- input: input,
- label: label,
- radioGroup: radioGroup,
- select: select,
- textarea: textarea,
- // badge: badge,
- // dialog: dialog,
- // table: table,
-};
diff --git a/packages/data-provider/src/azure.ts b/packages/data-provider/src/azure.ts
index 99d7032177..1343c01c69 100644
--- a/packages/data-provider/src/azure.ts
+++ b/packages/data-provider/src/azure.ts
@@ -240,89 +240,3 @@ export function mapModelToAzureConfig({
return result;
}
-
-export function mapGroupToAzureConfig({
- groupName,
- groupMap,
-}: {
- groupName: string;
- groupMap: TAzureGroupMap;
-}): MappedAzureConfig {
- const groupConfig = groupMap[groupName];
- if (!groupConfig) {
- throw new Error(`Group named "${groupName}" not found in configuration.`);
- }
-
- const instanceName = groupConfig.instanceName ?? '';
- const serverless = groupConfig.serverless ?? false;
- const baseURL = groupConfig.baseURL ?? '';
-
- if (!instanceName && !serverless) {
- throw new Error(
- `Group "${groupName}" is missing an instanceName for non-serverless configuration.`,
- );
- }
-
- if (serverless && !baseURL) {
- throw new Error(
- `Group "${groupName}" is missing the required base URL for serverless configuration.`,
- );
- }
-
- const models = Object.keys(groupConfig.models);
- if (models.length === 0) {
- throw new Error(`Group "${groupName}" does not have any models configured.`);
- }
-
- // Use the first available model in the group
- const firstModelName = models[0];
- const modelDetails = groupConfig.models[firstModelName];
-
- const azureOptions: AzureOptions = {
- azureOpenAIApiVersion: extractEnvVariable(groupConfig.version ?? ''),
- azureOpenAIApiKey: extractEnvVariable(groupConfig.apiKey),
- azureOpenAIApiInstanceName: extractEnvVariable(instanceName),
- // DeploymentName and Version set below
- };
-
- if (serverless) {
- return {
- azureOptions,
- baseURL: extractEnvVariable(baseURL),
- serverless: true,
- ...(groupConfig.additionalHeaders && { headers: groupConfig.additionalHeaders }),
- };
- }
-
- const { deploymentName = '', version = '' } =
- typeof modelDetails === 'object'
- ? {
- deploymentName: modelDetails.deploymentName ?? groupConfig.deploymentName,
- version: modelDetails.version ?? groupConfig.version,
- }
- : {
- deploymentName: groupConfig.deploymentName,
- version: groupConfig.version,
- };
-
- if (!deploymentName || !version) {
- throw new Error(
- `Model "${firstModelName}" in group "${groupName}" or the group itself is missing a deploymentName ("${deploymentName}") or version ("${version}").`,
- );
- }
-
- azureOptions.azureOpenAIApiDeploymentName = extractEnvVariable(deploymentName);
- azureOptions.azureOpenAIApiVersion = extractEnvVariable(version);
-
- const result: MappedAzureConfig = { azureOptions };
-
- if (baseURL) {
- result.baseURL = extractEnvVariable(baseURL);
- }
-
- if (groupConfig.additionalHeaders) {
- result.headers = groupConfig.additionalHeaders;
- }
-
- return result;
-}
diff --git a/packages/data-provider/src/bedrock.ts b/packages/data-provider/src/bedrock.ts
index 2a41c54c21..3eaade8f62 100644
--- a/packages/data-provider/src/bedrock.ts
+++ b/packages/data-provider/src/bedrock.ts
@@ -303,14 +303,6 @@ export function clampOutputConfigEffort(model: string, outputConfig: unknown): v
outputConfig.effort = clampEffortForDisabledThinking(model, outputConfig.effort);
}
-/** Whether a resolved thinking config is an explicit `{ type: 'disabled' }`. */
-export function isThinkingDisabled(thinking: unknown): boolean {
- if (typeof thinking !== 'object' || thinking === null || !('type' in thinking)) {
- return false;
- }
- return thinking.type === 'disabled';
-}
-
/** Whether a resolved thinking config asks for mid-thinking display updates (beta-gated). */
export function requestsThinkingDisplayUpdates(thinking: unknown): boolean {
if (typeof thinking !== 'object' || thinking === null || !('display' in thinking)) {
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index e54e08cd23..9b8f8fcb8e 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -198,9 +198,6 @@ export enum SettingsViews {
advanced = 'advanced',
}
-/** Validates any FileSources value — use for file metadata, DB records, and upload routing. */
-export const fileSourceSchema = z.nativeEnum(FileSources);
-
/**
* `allowedAddresses` is an SSRF exemption list scoped to private IP space.
* Validate at config-load time:
@@ -1113,7 +1110,6 @@ const managementApiSchema = z.object({ auth: managementApiAuthSchema.optional()
* overridable per-subagent.
*/
export const toolApprovalModeSchema = z.enum(['default', 'dontAsk', 'bypass']);
-export type ToolApprovalMode = z.infer<typeof toolApprovalModeSchema>;
/**
* Per-endpoint tool-approval policy.
@@ -2584,7 +2580,7 @@ export type TTermsOfService = z.infer<typeof termsOfServiceSchema>;
// Schema for localized string (either simple string or language-keyed object)
const localizedStringSchema = z.union([z.string(), z.record(z.string())]);
-export type LocalizedString = z.infer<typeof localizedStringSchema>;
+
export const mcpRefreshDefaults = {
toolsRefreshInterval: 5 * 60 * 1000,
statusRefreshInterval: 30 * 1000,
@@ -2622,8 +2618,6 @@ const mcpServersSchema = z
})
.optional();
-export type TMcpServersConfig = z.infer<typeof mcpServersSchema>;
-
/** Values the trace viewer uses for any `interface.traceViewer` field left unset. */
export const traceViewerDefaults = {
enabled: false,
@@ -4651,73 +4645,11 @@ export const supportsBalanceCheck = {
[EModelEndpoint.google]: true,
};
-export const visionModels = [
- 'qwen-vl',
- 'grok-vision',
- 'grok-2-vision',
- 'grok-3',
- 'grok-4.7',
- 'grok-4-7',
- 'gpt-4o-mini',
- 'gpt-4o',
- 'gpt-4-turbo',
- 'gpt-4-vision',
- 'o4-mini',
- 'o3',
- 'o1',
- 'gpt-5',
- 'gpt-4.1',
- 'gpt-4.5',
- 'llava',
- 'llava-13b',
- 'gemini-pro-vision',
- 'claude-3',
- 'gemma',
- 'gemini-exp',
- 'gemini-1.5',
- 'gemini-2',
- 'gemini-2.5',
- 'gemini-3',
- 'moondream',
- 'llama3.2-vision',
- 'llama-3.2-11b-vision',
- 'llama-3-2-11b-vision',
- 'llama-3.2-90b-vision',
- 'llama-3-2-90b-vision',
- 'llama-4',
- 'claude-opus-4',
- 'claude-sonnet-4',
- 'claude-haiku-4',
-];
export enum VisionModes {
generative = 'generative',
agents = 'agents',
}
-export function validateVisionModel({
- model,
- additionalModels = [],
- availableModels,
-}: {
- model: string;
- additionalModels?: string[];
- availableModels?: string[];
-}) {
- if (!model) {
- return false;
- }
-
- if (model.includes('gpt-4-turbo-preview') || model.includes('o1-mini')) {
- return false;
- }
-
- if (availableModels && !availableModels.includes(model)) {
- return false;
- }
-
- return visionModels.concat(additionalModels).some((visionModel) => model.includes(visionModel));
-}
-
export const imageGenTools = new Set([
'dalle',
'dall-e',
@@ -5134,31 +5066,6 @@ export enum AuthKeys {
ANTHROPIC_API_KEY = 'ANTHROPIC_API_KEY',
}
-/**
- * Enum for Image Detail Cost.
- *
- * **Low Res Fixed Cost:** `85`
- *
- * **High Res Calculation:**
- *
- * Number of `512px` Tiles * `170` + `85` (Additional Cost)
- */
-export enum ImageDetailCost {
- /**
- * Low resolution is a fixed value.
- */
- LOW = 85,
- /**
- * High resolution Cost Per Tile
- */
- HIGH = 170,
- /**
- * Additional Cost added to High Resolution Total Cost
- */
- // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
- ADDITIONAL = 85,
-}
-
/**
* Tab values for Settings Dialog
*/
diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.ts
index 2843e72c96..0e86c35f04 100644
--- a/packages/data-provider/src/data-service.ts
+++ b/packages/data-provider/src/data-service.ts
@@ -297,10 +297,6 @@ export function getUserBalance(): Promise<t.TBalanceResponse> {
return request.get(endpoints.balance());
}
-export const updateTokenCount = (text: string) => {
- return request.post(endpoints.tokenizer(), { arg: text });
-};
-
export const login = (payload: t.TLoginUser): Promise<t.TLoginResponse> => {
return request.post(endpoints.login(), payload);
};
@@ -316,10 +312,6 @@ export const register = (payload: t.TRegisterUser) => {
export const userKeyQuery = (name: string): Promise<t.TCheckUserKeyResponse> =>
request.get(endpoints.userKeyQuery(name));
-export const getLoginGoogle = () => {
- return request.get(endpoints.loginGoogle());
-};
-
export const requestPasswordReset = (
payload: t.TRequestPasswordReset,
): Promise<t.TRequestPasswordResetResponse> => {
@@ -352,10 +344,6 @@ export const resendVerificationEmail = (
return request.post(endpoints.resendVerificationEmail(), payload);
};
-export const getAvailablePlugins = (): Promise<s.TPlugin[]> => {
- return request.get(endpoints.plugins());
-};
-
export const updateUserPlugins = (payload: t.TUpdateUserPlugins) => {
return request.post(endpoints.userPlugins(), payload);
};
@@ -376,12 +364,6 @@ export const getMCPConnectionStatus = (): Promise<q.MCPConnectionStatusResponse>
return request.get(endpoints.mcpConnectionStatus());
};
-export const getMCPServerConnectionStatus = (
- serverName: string,
-): Promise<q.MCPServerConnectionStatusResponse> => {
- return request.get(endpoints.mcpServerConnectionStatus(serverName));
-};
-
export const getMCPAuthValues = (serverName: string): Promise<q.MCPAuthValuesResponse> => {
return request.get(endpoints.mcpAuthValues(serverName));
};
@@ -1019,10 +1001,6 @@ export const listConversations = (
return request.get(endpoints.conversations(params ?? {}));
};
-export function getConversations(cursor: string): Promise<t.TGetConversationsResponse> {
- return request.get(endpoints.conversations({ cursor }));
-}
-
export function getConversationById(id: string, signal?: AbortSignal): Promise<s.TConversation> {
return request.get(endpoints.conversationById(id), signal ? { signal } : undefined);
}
@@ -1649,10 +1627,6 @@ export function addTagToConversation(
): Promise<t.TTagConversationResponse> {
return request.put(endpoints.addTagToConversation(conversationId), payload);
}
-export function rebuildConversationTags(): Promise<t.TConversationTagsResponse> {
- return request.post(endpoints.conversationTags('rebuild'));
-}
-
export function healthCheck(): Promise<string> {
return request.get(endpoints.health());
}
@@ -1867,10 +1841,6 @@ export function getGraphApiToken(params: q.GraphTokenParams): Promise<q.GraphTok
return request.get(endpoints.graphToken(params.scopes));
}
-export function getDomainServerBaseUrl(): string {
- return `${endpoints.apiBaseUrl()}/api`;
-}
-
/* Active Jobs */
export interface ActiveJobsResponse {
activeJobIds: string[];
diff --git a/packages/data-provider/src/generate.ts b/packages/data-provider/src/generate.ts
index e12934ee4e..06a5d22fc2 100644
--- a/packages/data-provider/src/generate.ts
+++ b/packages/data-provider/src/generate.ts
@@ -1,10 +1,7 @@
import { z, ZodArray, ZodError, ZodIssueCode } from 'zod';
import type { ZodIssue } from 'zod';
import type { TConversation, TSetOption, TPreset } from './schemas';
-import { tConversationSchema, googleSettings as google, openAISettings as openAI } from './schemas';
-
-export type GoogleSettings = Partial<typeof google>;
-export type OpenAISettings = Partial<typeof google>;
+import { tConversationSchema } from './schemas';
export type ComponentType =
| 'input'
@@ -623,89 +620,3 @@ export function validateSettingDefinitions(settings: SettingsConfiguration): voi
throw new ZodError(errors);
}
}
-
-export const generateOpenAISchema = (customOpenAI: OpenAISettings) => {
- const defaults = { ...openAI, ...customOpenAI };
- return tConversationSchema
- .pick({
- model: true,
- chatGptLabel: true,
- promptPrefix: true,
- temperature: true,
- top_p: true,
- presence_penalty: true,
- frequency_penalty: true,
- resendFiles: true,
- imageDetail: true,
- maxContextTokens: true,
- })
- .transform((obj) => ({
- ...obj,
- model: obj.model ?? defaults.model.default,
- chatGptLabel: obj.chatGptLabel ?? null,
- promptPrefix: obj.promptPrefix ?? null,
- temperature: obj.temperature ?? defaults.temperature.default,
- top_p: obj.top_p ?? defaults.top_p.default,
- presence_penalty: obj.presence_penalty ?? defaults.presence_penalty.default,
- frequency_penalty: obj.frequency_penalty ?? defaults.frequency_penalty.default,
- resendFiles:
- typeof obj.resendFiles === 'boolean' ? obj.resendFiles : defaults.resendFiles.default,
- imageDetail: obj.imageDetail ?? defaults.imageDetail.default,
- maxContextTokens: obj.maxContextTokens ?? undefined,
- }))
- .catch(() => ({
- model: defaults.model.default,
- chatGptLabel: null,
- promptPrefix: null,
- temperature: defaults.temperature.default,
- top_p: defaults.top_p.default,
- presence_penalty: defaults.presence_penalty.default,
- frequency_penalty: defaults.frequency_penalty.default,
- resendFiles: defaults.resendFiles.default,
- imageDetail: defaults.imageDetail.default,
- maxContextTokens: undefined,
- }));
-};
-
-export const generateGoogleSchema = (customGoogle: GoogleSettings) => {
- const defaults = { ...google, ...customGoogle };
- return tConversationSchema
- .pick({
- model: true,
- modelLabel: true,
- promptPrefix: true,
- examples: true,
- temperature: true,
- maxOutputTokens: true,
- topP: true,
- topK: true,
- maxContextTokens: true,
- })
- .transform((obj) => {
- return {
- ...obj,
- model: obj.model ?? defaults.model.default,
- modelLabel: obj.modelLabel ?? null,
- promptPrefix: obj.promptPrefix ?? null,
- examples: obj.examples ?? [{ input: { content: '' }, output: { content: '' } }],
- temperature: obj.temperature ?? defaults.temperature.default,
- maxOutputTokens:
- obj.maxOutputTokens ??
- defaults.maxOutputTokens.reset(obj.model ?? defaults.model.default),
- topP: obj.topP ?? defaults.topP.default,
- topK: obj.topK ?? defaults.topK.default,
- maxContextTokens: obj.maxContextTokens ?? undefined,
- };
- })
- .catch(() => ({
- model: defaults.model.default,
- modelLabel: null,
- promptPrefix: null,
- examples: [{ input: { content: '' }, output: { content: '' } }],
- temperature: defaults.temperature.default,
- maxOutputTokens: defaults.maxOutputTokens.default,
- topP: defaults.topP.default,
- topK: defaults.topK.default,
- maxContextTokens: undefined,
- }));
-};
diff --git a/packages/data-provider/src/keys.ts b/packages/data-provider/src/keys.ts
index 6facec62d3..c439d5b8b3 100644
--- a/packages/data-provider/src/keys.ts
+++ b/packages/data-provider/src/keys.ts
@@ -27,8 +27,6 @@ export enum QueryKeys {
reasoningCapabilities = 'reasoningCapabilities',
presets = 'presets',
searchResults = 'searchResults',
- tokenCount = 'tokenCount',
- availablePlugins = 'availablePlugins',
startupConfig = 'startupConfig',
insights = 'insights',
insightsAccess = 'insightsAccess',
diff --git a/packages/data-provider/src/parsers.ts b/packages/data-provider/src/parsers.ts
index a423fe455d..6a88605671 100644
--- a/packages/data-provider/src/parsers.ts
+++ b/packages/data-provider/src/parsers.ts
@@ -15,7 +15,6 @@ import {
Providers,
anthropicSchema,
assistantSchema,
- // agentsSchema,
compactAgentsSchema,
compactGoogleSchema,
compactAssistantSchema,
@@ -70,10 +69,6 @@ const getFallbackEndpointSchema = <TSchema>(
return overrideSchema ?? schemas[endpointType];
};
-// const schemaCreators: Record<EModelEndpoint, (customSchema: DefaultSchemaValues) => EndpointSchema> = {
-// [EModelEndpoint.google]: createGoogleSchema,
-// };
-
/** Get the enabled endpoints from the `ENDPOINTS` environment variable */
export function getEnabledEndpoints() {
const defaultEndpoints: string[] = [
diff --git a/packages/data-provider/src/providers.ts b/packages/data-provider/src/providers.ts
index 6eccd14601..d0e5f718de 100644
--- a/packages/data-provider/src/providers.ts
+++ b/packages/data-provider/src/providers.ts
@@ -1,5 +1,4 @@
import { EModelEndpoint, Providers } from './schemas';
-import { KnownEndpoints } from './config';
/** Canonical provider identity used for branding across client and server. */
export enum ProviderId {
@@ -39,29 +38,6 @@ export const endpointToProvider: Partial<Record<EModelEndpoint, ProviderId>> = {
[EModelEndpoint.bedrock]: ProviderId.bedrock,
};
-export const knownEndpointToProvider: Record<KnownEndpoints, ProviderId> = {
- [KnownEndpoints.anyscale]: ProviderId.anyscale,
- [KnownEndpoints.apipie]: ProviderId.apipie,
- [KnownEndpoints.cohere]: ProviderId.cohere,
- [KnownEndpoints.fireworks]: ProviderId.fireworks,
- [KnownEndpoints.deepseek]: ProviderId.deepseek,
- [KnownEndpoints.moonshot]: ProviderId.moonshot,
- [KnownEndpoints.groq]: ProviderId.groq,
- [KnownEndpoints.helicone]: ProviderId.helicone,
- [KnownEndpoints.huggingface]: ProviderId.huggingface,
- [KnownEndpoints.lemonade]: ProviderId.lemonade,
- [KnownEndpoints.mistral]: ProviderId.mistral,
- [KnownEndpoints.mlx]: ProviderId.mlx,
- [KnownEndpoints.ollama]: ProviderId.ollama,
- [KnownEndpoints.openrouter]: ProviderId.openrouter,
- [KnownEndpoints.perplexity]: ProviderId.perplexity,
- [KnownEndpoints.shuttleai]: ProviderId.shuttleai,
- [KnownEndpoints['together.ai']]: ProviderId.together,
- [KnownEndpoints.unify]: ProviderId.unify,
- [KnownEndpoints.vercel]: ProviderId.vercel,
- [KnownEndpoints.xai]: ProviderId.xai,
-};
-
const providerAliases: Record<string, ProviderId> = {
chatgpt: ProviderId.openai,
gpt: ProviderId.openai,
diff --git a/packages/data-provider/src/react-query/react-query-service.ts b/packages/data-provider/src/react-query/react-query-service.ts
index 1ced8bbe88..5db3acb269 100644
--- a/packages/data-provider/src/react-query/react-query-service.ts
+++ b/packages/data-provider/src/react-query/react-query-service.ts
@@ -5,7 +5,6 @@ import type {
QueryObserverResult,
} from '@tanstack/react-query';
import type { MCPReinitializeResponse } from '../types/mcpServers';
-import { MCPServerConnectionStatusResponse } from '../types/queries';
import { Constants, initialModelsConfig } from '../config';
import { defaultOrderQuery } from '../types/assistants';
import * as permissions from '../accessPermissions';
@@ -75,18 +74,6 @@ export const useGetConversationByIdQuery = (
);
};
-//This isn't ideal because its just a query and we're using mutation, but it was the only way
-//to make it work with how the Chat component is structured
-export const useGetConversationByIdMutation = (id: string): UseMutationResult<s.TConversation> => {
- const queryClient = useQueryClient();
- return useMutation(() => dataService.getConversationById(id), {
- // onSuccess: (res: s.TConversation) => {
- onSuccess: () => {
- queryClient.invalidateQueries([QueryKeys.conversation, id]);
- },
- });
-};
-
export const useUpdateMessageMutation = (
id: string,
): UseMutationResult<unknown, unknown, t.TUpdateMessageRequest, unknown> => {
@@ -228,20 +215,6 @@ export const useDeletePresetMutation = (): UseMutationResult<
});
};
-export const useUpdateTokenCountMutation = (): UseMutationResult<
- t.TUpdateTokenCountResponse,
- unknown,
- { text: string },
- unknown
-> => {
- const queryClient = useQueryClient();
- return useMutation(({ text }: { text: string }) => dataService.updateTokenCount(text), {
- onSuccess: () => {
- queryClient.invalidateQueries([QueryKeys.tokenCount]);
- },
- });
-};
-
export const useRegisterUserMutation = (
options?: m.RegistrationOptions,
): UseMutationResult<t.TError, unknown, t.TRegisterUser, unknown> => {
@@ -302,21 +275,6 @@ export const useResetPasswordMutation = (): UseMutationResult<
return useMutation((payload: t.TResetPassword) => dataService.resetPassword(payload));
};
-export const useAvailablePluginsQuery = <TData = s.TPlugin[]>(
- config?: UseQueryOptions<s.TPlugin[], unknown, TData>,
-): QueryObserverResult<TData> => {
- return useQuery<s.TPlugin[], unknown, TData>(
- [QueryKeys.availablePlugins],
- () => dataService.getAvailablePlugins(),
- {
- refetchOnWindowFocus: false,
- refetchOnReconnect: false,
- refetchOnMount: false,
- ...config,
- },
- );
-};
-
export const useUpdateUserPluginsMutation = (
_options?: m.UpdatePluginAuthOptions,
): UseMutationResult<t.TUser, unknown, t.TUpdateUserPlugins, unknown> => {
@@ -512,24 +470,6 @@ export const useGetAllEffectivePermissionsQuery = (
});
};
-export const useMCPServerConnectionStatusQuery = (
- serverName: string,
- config?: UseQueryOptions<MCPServerConnectionStatusResponse>,
-): QueryObserverResult<MCPServerConnectionStatusResponse> => {
- return useQuery<MCPServerConnectionStatusResponse>(
- [QueryKeys.mcpConnectionStatus, serverName],
- () => dataService.getMCPServerConnectionStatus(serverName),
- {
- refetchOnWindowFocus: false,
- refetchOnReconnect: false,
- refetchOnMount: false,
- staleTime: 10000, // 10 seconds
- enabled: !!serverName,
- ...config,
- },
- );
-};
-
export const useGetAgentApiKeysQuery = (
config?: UseQueryOptions<t.TAgentApiKeyListResponse>,
): QueryObserverResult<t.TAgentApiKeyListResponse> => {
diff --git a/packages/data-provider/src/schemas.ts b/packages/data-provider/src/schemas.ts
index 8a45898068..a5117b0e05 100644
--- a/packages/data-provider/src/schemas.ts
+++ b/packages/data-provider/src/schemas.ts
@@ -585,9 +585,6 @@ export const getGoogleThinkingBudgetBounds = (
return undefined;
};
-export const getGoogleThinkingBudgetMax = (modelName: string): number | undefined =>
- getGoogleThinkingBudgetBounds(modelName)?.max;
-
export const googleSettings = {
model: {
default: 'gemini-1.5-flash-latest' as const,
@@ -1577,34 +1574,6 @@ export const googleSchema = googleBaseSchema
.transform((obj: Partial<TConversation>) => removeNullishValues(obj, true))
.catch(() => ({}));
-/**
- * TODO: Map the following fields:
- - presence_penalty -> presencePenalty
- - frequency_penalty -> frequencyPenalty
- - stop -> stopSequences
- */
-export const googleGenConfigSchema = z
- .object({
- maxOutputTokens: coerceNumber.optional(),
- temperature: coerceNumber.optional(),
- topP: coerceNumber.optional(),
- topK: coerceNumber.optional(),
- presencePenalty: coerceNumber.optional(),
- frequencyPenalty: coerceNumber.optional(),
- stopSequences: z.array(z.string()).optional(),
- thinkingConfig: z
- .object({
- includeThoughts: z.boolean().optional(),
- thinkingBudget: coerceNumber.optional(),
- thinkingLevel: z.string().optional(),
- })
- .optional(),
- web_search: z.boolean().optional(),
- url_context: z.boolean().optional(),
- })
- .strip()
- .optional();
-
export function removeNullishValues<T extends Record<string, unknown>>(
obj: T,
removeEmptyStrings?: boolean,
diff --git a/packages/data-provider/src/types.ts b/packages/data-provider/src/types.ts
index c2fc8391ca..d1c8adfab1 100644
--- a/packages/data-provider/src/types.ts
+++ b/packages/data-provider/src/types.ts
@@ -344,13 +344,6 @@ export type TUpdateUserPreferencesResponse = {
preferences: TUpdateUserPreferencesRequest;
};
-export type TGetConversationsResponse = {
- conversations: TConversation[];
- pageNumber: string;
- pageSize: string | number;
- pages: string | number;
-};
-
export type TUpdateMessageRequest = {
conversationId: string;
messageId: string;
@@ -598,15 +591,6 @@ export type TForkSharedConvoRequest = {
shareRevision?: string;
};
-export type TSearchResults = {
- conversations: TConversation[];
- messages: TMessage[];
- pageNumber: string;
- pageSize: string | number;
- pages: string | number;
- filter: object;
-};
-
export type TPublicCodeEnvironment = {
id: string;
name: string;
@@ -789,16 +773,6 @@ export type TReasoningCapabilitiesResponse = {
/** endpoint → model → resolved tokenomics, from GET /api/endpoints/token-config */
export type TTokenConfigMap = Record<string, Record<string, TModelTokenomics>>;
-export type TUpdateTokenCountResponse = {
- count: number;
-};
-
-export type TMessageTreeNode = object;
-
-export type TSearchMessage = object;
-
-export type TSearchMessageTreeNode = object;
-
export type TRegisterUserResponse = {
message: string;
};
diff --git a/packages/data-provider/src/types/content.ts b/packages/data-provider/src/types/content.ts
index 2a2b13c8b6..3c418a722d 100644
--- a/packages/data-provider/src/types/content.ts
+++ b/packages/data-provider/src/types/content.ts
@@ -345,6 +345,3 @@ export type TContentData = StreamContentData & {
thread_id: string;
stream?: boolean;
};
-
-export const hostImageIdSuffix = '_host_copy';
-export const hostImageNamePrefix = 'host_copy_';
diff --git a/packages/data-provider/src/types/mutations.ts b/packages/data-provider/src/types/mutations.ts
index b4607bfaa6..74929ccac3 100644
--- a/packages/data-provider/src/types/mutations.ts
+++ b/packages/data-provider/src/types/mutations.ts
@@ -210,26 +210,11 @@ export type ForkSharedConvoOptions = MutationOptions<
types.TForkSharedConvoRequest
>;
-export type CreateSharedLinkOptions = MutationOptions<
- types.TSharedLink,
- Partial<types.TSharedLink>
->;
-
export type updateTagsInConvoOptions = MutationOptions<
types.TTagConversationResponse,
types.TTagConversationRequest
>;
-export type UpdateSharedLinkOptions = MutationOptions<
- types.TSharedLink,
- Partial<types.TSharedLink>
->;
-
-export type ArchiveConvoOptions = MutationOptions<
- types.TArchiveConversationResponse,
- types.TArchiveConversationRequest
->;
-
export type ArchiveAllConversationsOptions = MutationOptions<
types.TArchiveAllConversationsResponse,
void
@@ -510,11 +495,6 @@ export type TLogoutResponse = {
export type LogoutOptions = MutationOptions<TLogoutResponse, undefined>;
-export interface AssistantInitialize {
- message: string;
- error?: string;
-}
-
export interface CancelMCPOAuthResponse {
success: boolean;
message: string;
diff --git a/packages/data-provider/src/types/queries.ts b/packages/data-provider/src/types/queries.ts
index ac7947800e..c3fcfcfb1c 100644
--- a/packages/data-provider/src/types/queries.ts
+++ b/packages/data-provider/src/types/queries.ts
@@ -312,17 +312,6 @@ export interface MCPConnectionStatusResponse {
oauthTimeout?: number;
}
-export interface MCPServerConnectionStatusResponse {
- success: boolean;
- serverName: string;
- requiresOAuth: boolean;
- requestScoped?: boolean;
- configurationState?: MCPServerStatus['configurationState'];
- connectionStatus: 'disconnected' | 'connecting' | 'connected' | 'error';
- authorizationState?: MCPServerStatus['authorizationState'];
- authorizationGeneration?: string;
-}
-
export interface MCPAuthValuesResponse {
success: boolean;
serverName: string;
diff --git a/packages/data-provider/src/types/web.ts b/packages/data-provider/src/types/web.ts
index 117dce4415..ae96c975d7 100644
--- a/packages/data-provider/src/types/web.ts
+++ b/packages/data-provider/src/types/web.ts
@@ -1,21 +1,7 @@
import type { Logger as WinstonLogger } from 'winston';
-import type { z } from 'zod';
-import type { webSearchSchema } from '../config';
export type SearchRefType = 'search' | 'image' | 'news' | 'video' | 'ref';
-export enum DATE_RANGE {
- PAST_HOUR = 'h',
- PAST_24_HOURS = 'd',
- PAST_WEEK = 'w',
- PAST_MONTH = 'm',
- PAST_YEAR = 'y',
-}
-
-export type SearchProvider = 'serper' | 'searxng' | 'tavily' | 'keenable';
-export type ScraperProvider = 'firecrawl' | 'serper' | 'tavily' | 'keenable';
-export type RerankerType = 'infinity' | 'jina' | 'cohere' | 'none';
-
export interface Highlight {
score: number;
text: string;
@@ -71,132 +57,11 @@ export interface Source {
date?: string;
}
-export interface SearchConfig {
- searchProvider?: SearchProvider;
- serperApiKey?: string;
- searxngInstanceUrl?: string;
- searxngApiKey?: string;
- searxngSearchOptions?: z.infer<typeof webSearchSchema>['searxngSearchOptions'];
- tavilyApiKey?: string;
- tavilySearchUrl?: string;
- tavilySearchOptions?: TavilyConfig['tavilySearchOptions'];
- keenableApiKey?: string;
- keenableApiUrl?: string;
- keenableSearchOptions?: KeenableConfig['keenableSearchOptions'];
-}
-
export type References = {
links: MediaReference[];
images: MediaReference[];
videos: MediaReference[];
};
-export interface ScrapeResult {
- url: string;
- error?: boolean;
- content: string;
- attribution?: string;
- references?: References;
- highlights?: Highlight[];
-}
-
-export interface ProcessSourcesConfig {
- topResults?: number;
- strategies?: string[];
- filterContent?: boolean;
- reranker?: unknown;
- logger?: Logger;
-}
-
-export interface FirecrawlConfig {
- firecrawlApiKey?: string;
- firecrawlApiUrl?: string;
- firecrawlOptions?: {
- formats?: string[];
- includeTags?: string[];
- excludeTags?: string[];
- headers?: Record<string, string>;
- waitFor?: number;
- timeout?: number;
- maxAge?: number;
- mobile?: boolean;
- skipTlsVerification?: boolean;
- blockAds?: boolean;
- removeBase64Images?: boolean;
- parsePDF?: boolean;
- storeInCache?: boolean;
- zeroDataRetention?: boolean;
- location?: {
- country?: string;
- languages?: string[];
- };
- onlyMainContent?: boolean;
- changeTrackingOptions?: {
- modes?: string[];
- schema?: Record<string, unknown>;
- prompt?: string;
- tag?: string | null;
- };
- };
-}
-
-export interface TavilyConfig {
- tavilyApiKey?: string;
- tavilySearchUrl?: string;
- tavilyExtractUrl?: string;
- tavilySearchOptions?: z.infer<typeof webSearchSchema>['tavilySearchOptions'];
- tavilyScraperOptions?: z.infer<typeof webSearchSchema>['tavilyScraperOptions'];
-}
-
-export interface KeenableConfig {
- keenableApiKey?: string;
- keenableApiUrl?: string;
- keenableSearchOptions?: z.infer<typeof webSearchSchema>['keenableSearchOptions'];
- keenableScraperOptions?: z.infer<typeof webSearchSchema>['keenableScraperOptions'];
-}
-
-export interface ScraperContentResult {
- content: string;
-}
-
-export interface ScraperExtractionResult {
- no_extraction: ScraperContentResult;
-}
-
-export interface JinaRerankerResult {
- index: number;
- relevance_score: number;
- document?: string | { text: string };
-}
-
-export interface JinaRerankerResponse {
- model: string;
- usage: {
- total_tokens: number;
- };
- results: JinaRerankerResult[];
-}
-
-export interface CohereRerankerResult {
- index: number;
- relevance_score: number;
-}
-
-export interface CohereRerankerResponse {
- results: CohereRerankerResult[];
- id: string;
- meta: {
- api_version: {
- version: string;
- is_experimental: boolean;
- };
- billed_units: {
- search_units: number;
- };
- };
-}
-
-export type SafeSearchLevel = 0 | 1 | 2;
-
export type Logger = WinstonLogger;
export interface MediaReference {
originalUrl: string;
@@ -212,98 +77,6 @@ export type UsedReferences = {
/** Firecrawl */
-export interface FirecrawlScrapeOptions {
- formats?: string[];
- includeTags?: string[];
- excludeTags?: string[];
- headers?: Record<string, string>;
- waitFor?: number;
- timeout?: number;
-}
-
-export interface ScrapeMetadata {
- // Core source information
- sourceURL?: string;
- url?: string;
- scrapeId?: string;
- statusCode?: number;
- // Basic metadata
- title?: string;
- description?: string;
- language?: string;
- favicon?: string;
- viewport?: string;
- robots?: string;
- 'theme-color'?: string;
- // Open Graph metadata
- 'og:url'?: string;
- 'og:title'?: string;
- 'og:description'?: string;
- 'og:type'?: string;
- 'og:image'?: string;
- 'og:image:width'?: string;
- 'og:image:height'?: string;
- 'og:site_name'?: string;
- ogUrl?: string;
- ogTitle?: string;
- ogDescription?: string;
- ogImage?: string;
- ogSiteName?: string;
- // Article metadata
- 'article:author'?: string;
- 'article:published_time'?: string;
- 'article:modified_time'?: string;
- 'article:section'?: string;
- 'article:tag'?: string;
- 'article:publisher'?: string;
- publishedTime?: string;
- modifiedTime?: string;
- // Twitter metadata
- 'twitter:site'?: string | boolean | number | null;
- 'twitter:creator'?: string;
- 'twitter:card'?: string;
- 'twitter:image'?: string;
- 'twitter:dnt'?: string;
- 'twitter:app:name:iphone'?: string;
- 'twitter:app:id:iphone'?: string;
- 'twitter:app:url:iphone'?: string;
- 'twitter:app:name:ipad'?: string;
- 'twitter:app:id:ipad'?: string;
- 'twitter:app:url:ipad'?: string;
- 'twitter:app:name:googleplay'?: string;
- 'twitter:app:id:googleplay'?: string;
- 'twitter:app:url:googleplay'?: string;
- // Facebook metadata
- 'fb:app_id'?: string;
- // App links
- 'al:ios:url'?: string;
- 'al:ios:app_name'?: string;
- 'al:ios:app_store_id'?: string;
- // Allow for additional properties that might be present
- [key: string]: string | number | boolean | null | undefined;
-}
-
-export interface FirecrawlScrapeResponse {
- success: boolean;
- data?: {
- markdown?: string;
- html?: string;
- rawHtml?: string;
- screenshot?: string;
- links?: string[];
- metadata?: ScrapeMetadata;
- };
- error?: string;
-}
-
-export interface FirecrawlScraperConfig {
- apiKey?: string;
- apiUrl?: string;
- formats?: string[];
- timeout?: number;
- logger?: Logger;
-}
-
/** Serper API */
export interface VideoResult {
title?: string;
@@ -353,15 +126,6 @@ export interface ShoppingResult {
position?: number;
}
-export interface ScholarResult {
- title?: string;
- link?: string;
- publicationInfo?: string;
- snippet?: string;
- year?: number;
- citedBy?: number;
-}
-
export interface ImageResult {
title?: string;
imageUrl?: string;
@@ -377,29 +141,6 @@ export interface ImageResult {
position?: number;
}
-export interface SerperSearchPayload extends SerperSearchInput {
- /**
- * Search type/vertical
- * Options: "search" (web), "images", "news", "places", "videos"
- */
- type?: 'search' | 'images' | 'news' | 'places' | 'videos';
-
- /**
- * Starting index for search results pagination (used instead of page)
- */
- start?: number;
-
- /**
- * Filtering for safe search
- * Options: "off", "moderate", "active"
- */
- safe?: 'off' | 'moderate' | 'active';
-}
-
-export type SerperSearchParameters = Pick<SerperSearchPayload, 'q' | 'type'> & {
- engine: 'google';
-};
-
export interface OrganicResult {
position?: number;
title?: string;
@@ -446,168 +187,3 @@ export interface PeopleAlsoAskResult {
}
export type RelatedSearches = Array<{ query: string }>;
-
-export interface SerperSearchInput {
- /**
- * The search query string
- */
- q: string;
-
- /**
- * Country code for localized results
- * Examples: "us", "uk", "ca", "de", etc.
- */
- gl?: string;
-
- /**
- * Interface language
- * Examples: "en", "fr", "de", etc.
- */
- hl?: string;
-
- /**
- * Number of results to return (up to 100)
- */
- num?: number;
- /**
- * Specific location for contextual results
- * Example: "New York, NY"
- */
- location?: string;
-
- /**
- * Search autocorrection setting
- */
- autocorrect?: boolean;
- page?: number;
- /**
- * Date range for search results
- * Options: "h" (past hour), "d" (past 24 hours), "w" (past week),
- * "m" (past month), "y" (past year)
- * `qdr:${DATE_RANGE}`
- */
- tbs?: string;
-}
-
-export type SerperResultData = {
- searchParameters: SerperSearchPayload;
- organic?: OrganicResult[];
- topStories?: TopStoryResult[];
- images?: ImageResult[];
- videos?: VideoResult[];
- places?: PlaceResult[];
- news?: NewsResult[];
- shopping?: ShoppingResult[];
- peopleAlsoAsk?: PeopleAlsoAskResult[];
- relatedSearches?: RelatedSearches;
- knowledgeGraph?: KnowledgeGraphResult;
- answerBox?: AnswerBoxResult;
- credits?: number;
-};
-
-/** SearXNG */
-
-export interface SearxNGSearchPayload {
- /**
- * The search query string
- * Supports syntax specific to different search engines
- * Example: "site:github.com SearXNG"
- */
- q: string;
-
- /**
- * Comma-separated list of search categories
- * Example: "general,images,news"
- */
- categories?: string;
-
- /**
- * Comma-separated list of search engines to use
- * Example: "google,bing,duckduckgo"
- */
- engines?: string;
-
- /**
- * Code of the language for search results
- * Example: "en", "fr", "de", "es"
- */
- language?: string;
-
- /**
- * Search page number
- * Default: 1
- */
- pageno?: number;
-
- /**
- * Time range filter for search results
- * Options: "day", "month", "year"
- */
- time_range?: 'day' | 'month' | 'year';
-
- /**
- * Output format of results
- * Options: "json", "csv", "rss"
- */
- format?: 'json' | 'csv' | 'rss';
-
- /**
- * Open search results on new tab
- * Options: `0` (off), `1` (on)
- */
- results_on_new_tab?: 0 | 1;
-
- /**
- * Proxy image results through SearxNG
- * Options: true, false
- */
- image_proxy?: boolean;
-
- /**
- * Service for autocomplete suggestions
- * Options: "google", "dbpedia", "duckduckgo", "mwmbl",
- * "startpage", "wikipedia", "stract", "swisscows", "qwant"
- */
- autocomplete?: string;
-
- /**
- * Safe search filtering level
- * Options: "0" (off), "1" (moderate), "2" (strict)
- */
- safesearch?: 0 | 1 | 2;
-
- /**
- * Theme to use for results page
- * Default: "simple" (other themes may be available per instance)
- */
- theme?: string;
-
- /**
- * List of enabled plugins
- * Default: "Hash_plugin,Self_Information,Tracker_URL_remover,Ahmia_blacklist"
- */
- enabled_plugins?: string;
-
- /**
- * List of disabled plugins
- */
- disabled_plugins?: string;
-
- /**
- * List of enabled engines
- */
- enabled_engines?: string;
-
- /**
- * List of disabled engines
- */
- disabled_engines?: string;
-}
-
-export interface SearXNGResult {
- title?: string;
- url?: string;
- content?: string;
- publishedDate?: string;
- img_src?: string;
-}
diff --git a/packages/data-schemas/misc/ferretdb/ferretdb-multitenancy-plan.md b/packages/data-schemas/misc/ferretdb/ferretdb-multitenancy-plan.md
index 5e2569d087..690388351f 100644
--- a/packages/data-schemas/misc/ferretdb/ferretdb-multitenancy-plan.md
+++ b/packages/data-schemas/misc/ferretdb/ferretdb-multitenancy-plan.md
@@ -178,7 +178,7 @@ Total: 3,390ms for 5 orgs (678ms avg, but 165ms median)
### 1. Org Provisioning
-Use `initializeOrgCollections()` from `packages/data-schemas/src/utils/retryWithBackoff.ts` for all new org setup. Process orgs in batches of 10 with `Promise.all()` to parallelize across pools while minimizing per-pool contention.
+Use `createIndexesWithRetry()` from `packages/data-schemas/src/utils/retry.ts` for all new org setup. Process orgs in batches of 10 with `Promise.all()` to parallelize across pools while minimizing per-pool contention.
### 2. Backup Strategy
diff --git a/packages/data-schemas/misc/ferretdb/orgOperations.ferretdb.spec.ts b/packages/data-schemas/misc/ferretdb/orgOperations.ferretdb.spec.ts
index b115e0f0cb..97f256efe2 100644
--- a/packages/data-schemas/misc/ferretdb/orgOperations.ferretdb.spec.ts
+++ b/packages/data-schemas/misc/ferretdb/orgOperations.ferretdb.spec.ts
@@ -1,5 +1,6 @@
import mongoose, { Schema, type Connection, type Model } from 'mongoose';
-import { initializeOrgCollections, createIndexesWithRetry, retryWithBackoff } from '~/utils/retry';
+import { createIndexesWithRetry, retryWithBackoff } from '~/utils/retry';
+import type { IndexBuildOptions } from '~/utils/retry';
import { getModelSchemas } from './schemas';
/**
@@ -30,6 +31,27 @@ const MODEL_COUNT = Object.keys(MODEL_SCHEMAS).length;
const NEW_MODEL = 'OrgEvent';
const NEW_COLLECTION = 'orgevents';
+/**
+ * Creates every collection and its indexes for a set of models, sequentially and
+ * with per-model deadlock retry, to keep contention on the catalog low.
+ */
+async function initializeOrgCollections(
+ models: Record<string, Model<unknown>>,
+ options: IndexBuildOptions = {},
+): Promise<{ totalMs: number; perModel: Array<{ name: string; ms: number }> }> {
+ const perModel: Array<{ name: string; ms: number }> = [];
+ const t0 = Date.now();
+
+ for (const model of Object.values(models)) {
+ const modelStart = Date.now();
+ await model.createCollection();
+ await createIndexesWithRetry(model, options);
+ perModel.push({ name: model.modelName, ms: Date.now() - modelStart });
+ }
+
+ return { totalMs: Date.now() - t0, perModel };
+}
+
function registerModels(
conn: Connection,
schemas: Record<string, Schema> = MODEL_SCHEMAS,
diff --git a/packages/data-schemas/package.json b/packages/data-schemas/package.json
index a29335ac79..9297895dc6 100644
--- a/packages/data-schemas/package.json
+++ b/packages/data-schemas/package.json
@@ -63,14 +63,12 @@
"micromark-util-decode-string": "^2.0.0"
},
"devDependencies": {
- "@types/express": "^5.0.0",
"@types/jest": "^29.5.2",
"@types/node": "^24.12.4",
"jest": "^30.2.0",
"jest-junit": "^17.0.0",
"mongodb-memory-server": "^11.0.1",
"rimraf": "^6.1.3",
- "ts-node": "^10.9.2",
"tsdown": "^0.22.2",
"typescript": "^5.9.3"
},
diff --git a/packages/data-schemas/src/crypto/index.ts b/packages/data-schemas/src/crypto/index.ts
index b030ec96be..b0feed5ea2 100644
--- a/packages/data-schemas/src/crypto/index.ts
+++ b/packages/data-schemas/src/crypto/index.ts
@@ -162,16 +162,3 @@ export async function getRandomValues(length: number): Promise<string> {
webcrypto.getRandomValues(randomValues);
return Buffer.from(randomValues).toString('hex');
}
-
-/**
- * Computes SHA-256 hash for the given input.
- * @param input - The input to hash.
- * @returns The SHA-256 hash of the input.
- */
-export async function hashBackupCode(input: string): Promise<string> {
- const encoder = new TextEncoder();
- const data = encoder.encode(input);
- const hashBuffer = await webcrypto.subtle.digest('SHA-256', data);
- const hashArray = Array.from(new Uint8Array(hashBuffer));
- return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
-}
diff --git a/packages/data-schemas/src/methods/accessRole.spec.ts b/packages/data-schemas/src/methods/accessRole.spec.ts
index 41d6da4d82..58b2f674c0 100644
--- a/packages/data-schemas/src/methods/accessRole.spec.ts
+++ b/packages/data-schemas/src/methods/accessRole.spec.ts
@@ -57,15 +57,6 @@ describe('AccessRole Model Tests', () => {
expect(role.resourceType).toBe(ResourceType.CODE_ENVIRONMENT);
});
- test('should find a role by its ID', async () => {
- const createdRole = await methods.createRole(sampleRole);
- const foundRole = await methods.findRoleById(createdRole._id);
-
- expect(foundRole).toBeDefined();
- expect(foundRole?._id.toString()).toBe(createdRole._id.toString());
- expect(foundRole?.accessRoleId).toBe(sampleRole.accessRoleId);
- });
-
test('should find a role by its identifier', async () => {
await methods.createRole(sampleRole);
const foundRole = await methods.findRoleByIdentifier(sampleRole.accessRoleId);
@@ -102,27 +93,6 @@ describe('AccessRole Model Tests', () => {
const foundRole = await methods.findRoleByIdentifier(sampleRole.accessRoleId);
expect(foundRole).toBeNull();
});
-
- test('should get all roles', async () => {
- const roles = [
- sampleRole,
- {
- accessRoleId: 'test_editor',
- name: 'Test Editor',
- description: 'Test role for editor permissions',
- resourceType: ResourceType.AGENT,
- permBits: RoleBits.EDITOR,
- },
- ];
-
- await Promise.all(roles.map((role) => methods.createRole(role)));
-
- const allRoles = await methods.getAllRoles();
- expect(allRoles).toHaveLength(2);
- expect(allRoles.map((r) => r.accessRoleId).sort()).toEqual(
- ['test_editor', 'test_viewer'].sort(),
- );
- });
});
describe('Resource and Permission Queries', () => {
@@ -175,23 +145,6 @@ describe('AccessRole Model Tests', () => {
['project_editor', 'project_viewer'].sort(),
);
});
-
- test('should find role by permissions', async () => {
- const viewerRole = await methods.findRoleByPermissions('agent', RoleBits.VIEWER);
- expect(viewerRole).toBeDefined();
- expect(viewerRole?.accessRoleId).toBe(AccessRoleIds.AGENT_VIEWER);
-
- const editorRole = await methods.findRoleByPermissions('agent', RoleBits.EDITOR);
- expect(editorRole).toBeDefined();
- expect(editorRole?.accessRoleId).toBe(AccessRoleIds.AGENT_EDITOR);
- });
-
- test('should return null when no role matches the permissions', async () => {
- // Create a custom permission that doesn't match any existing role
- const customPerm = PermissionBits.VIEW | PermissionBits.SHARE;
- const role = await methods.findRoleByPermissions('agent', customPerm);
- expect(role).toBeNull();
- });
});
describe('seedDefaultRoles', () => {
@@ -263,83 +216,4 @@ describe('AccessRole Model Tests', () => {
expect(role?.description).toBe(customRole.description);
});
});
-
- describe('getRoleForPermissions', () => {
- beforeEach(async () => {
- await AccessRole.deleteMany({});
-
- // Create sample roles with ascending permission levels
- await Promise.all([
- methods.createRole({
- accessRoleId: AccessRoleIds.AGENT_VIEWER,
- name: 'Agent Viewer',
- resourceType: ResourceType.AGENT,
- permBits: RoleBits.VIEWER, // 1
- }),
- methods.createRole({
- accessRoleId: AccessRoleIds.AGENT_EDITOR,
- name: 'Agent Editor',
- resourceType: ResourceType.AGENT,
- permBits: RoleBits.EDITOR, // 3
- }),
- methods.createRole({
- accessRoleId: 'agent_manager',
- name: 'Agent Manager',
- resourceType: ResourceType.AGENT,
- permBits: RoleBits.MANAGER, // 7
- }),
- methods.createRole({
- accessRoleId: AccessRoleIds.AGENT_OWNER,
- name: 'Agent Owner',
- resourceType: ResourceType.AGENT,
- permBits: RoleBits.OWNER, // 15
- }),
- ]);
- });
-
- test('should find exact matching role', async () => {
- const role = await methods.getRoleForPermissions('agent', RoleBits.EDITOR);
- expect(role).toBeDefined();
- expect(role?.accessRoleId).toBe(AccessRoleIds.AGENT_EDITOR);
- expect(role?.permBits).toBe(RoleBits.EDITOR);
- });
-
- test('should find closest compatible role without exceeding permissions', async () => {
- // Create a custom permission between VIEWER and EDITOR
- const customPerm = PermissionBits.VIEW | PermissionBits.SHARE; // 9
-
- // Should return VIEWER (1) as closest matching role without exceeding the permission bits
- const role = await methods.getRoleForPermissions('agent', customPerm);
- expect(role).toBeDefined();
- expect(role?.accessRoleId).toBe(AccessRoleIds.AGENT_VIEWER);
- });
-
- test('should return null when no compatible role is found', async () => {
- // Create a permission that doesn't match any existing permission pattern
- const invalidPerm = 100;
-
- const role = await methods.getRoleForPermissions('agent', invalidPerm as PermissionBits);
- expect(role).toBeNull();
- });
-
- test('should find role for resource-specific permissions', async () => {
- // Create a role for a different resource type
- await methods.createRole({
- accessRoleId: 'project_viewer',
- name: 'Project Viewer',
- resourceType: 'project',
- permBits: RoleBits.VIEWER,
- });
-
- // Query for agent roles
- const agentRole = await methods.getRoleForPermissions('agent', RoleBits.VIEWER);
- expect(agentRole).toBeDefined();
- expect(agentRole?.accessRoleId).toBe(AccessRoleIds.AGENT_VIEWER);
-
- // Query for project roles
- const projectRole = await methods.getRoleForPermissions('project', RoleBits.VIEWER);
- expect(projectRole).toBeDefined();
- expect(projectRole?.accessRoleId).toBe('project_viewer');
- });
- });
});
diff --git a/packages/data-schemas/src/methods/accessRole.tenant.spec.ts b/packages/data-schemas/src/methods/accessRole.tenant.spec.ts
index c03e6a3b4a..fea59ffd9b 100644
--- a/packages/data-schemas/src/methods/accessRole.tenant.spec.ts
+++ b/packages/data-schemas/src/methods/accessRole.tenant.spec.ts
@@ -250,20 +250,6 @@ describe('access role resolution under tenant isolation', () => {
);
});
- it('never yields the withdrawn owner bits through a permission lookup', async () => {
- await seedGlobalRoles();
- await moveAgentOwnerToSkill('tenant-a');
-
- const [exact, closest] = await tenantStorage.run({ tenantId: 'tenant-a' }, async () => [
- await methods.findRoleByPermissions(ResourceType.AGENT, RoleBits.OWNER),
- await methods.getRoleForPermissions(ResourceType.AGENT, RoleBits.OWNER),
- ]);
-
- expect(exact).toBeNull();
- /** The closest agent role still visible, not the superseded global owner */
- expect(closest?.accessRoleId).toBe(AccessRoleIds.AGENT_EDITOR);
- });
-
it('agrees with findRoleByIdentifier on the identifier’s new meaning', async () => {
await seedGlobalRoles();
await moveAgentOwnerToSkill('tenant-a');
@@ -277,68 +263,4 @@ describe('access role resolution under tenant isolation', () => {
);
});
});
-
- describe('findRoleByPermissions', () => {
- it('resolves a global default role from inside a tenant context', async () => {
- await seedGlobalRoles();
-
- const role = await tenantStorage.run({ tenantId: 'tenant-a' }, () =>
- methods.findRoleByPermissions(ResourceType.AGENT, RoleBits.OWNER),
- );
-
- expect(role).toEqual(expect.objectContaining({ accessRoleId: AccessRoleIds.AGENT_OWNER }));
- });
-
- it('does not match a global role whose identifier the tenant has redefined', async () => {
- await seedGlobalRoles();
- await shadowAgentOwnerAsEditor('tenant-a');
-
- const role = await tenantStorage.run({ tenantId: 'tenant-a' }, () =>
- methods.findRoleByPermissions(ResourceType.AGENT, RoleBits.OWNER),
- );
-
- /** No role visible to the tenant carries OWNER bits any more */
- expect(role).toBeNull();
- });
- });
-
- describe('getRoleForPermissions', () => {
- it('falls back to the global roles from inside a tenant context', async () => {
- await seedGlobalRoles();
-
- const role = await tenantStorage.run({ tenantId: 'tenant-a' }, () =>
- methods.getRoleForPermissions(ResourceType.AGENT, RoleBits.OWNER),
- );
-
- expect(role).toEqual(expect.objectContaining({ accessRoleId: AccessRoleIds.AGENT_OWNER }));
- });
-
- it('never grants the shadowed global bits when the tenant redefined the role', async () => {
- await seedGlobalRoles();
- await shadowAgentOwnerAsEditor('tenant-a');
-
- const role = await tenantStorage.run({ tenantId: 'tenant-a' }, () =>
- methods.getRoleForPermissions(ResourceType.AGENT, RoleBits.OWNER),
- );
-
- /** The closest visible role without exceeding OWNER, not the global OWNER row */
- expect(role?.permBits).toBe(RoleBits.EDITOR);
- });
-
- it('agrees with findRoleByIdentifier on what a shadowed identifier means', async () => {
- await seedGlobalRoles();
- await shadowAgentOwnerAsEditor('tenant-a');
-
- const [byIdentifier, byPermissions] = await tenantStorage.run(
- { tenantId: 'tenant-a' },
- async () => [
- await methods.findRoleByIdentifier(AccessRoleIds.AGENT_OWNER),
- await methods.getRoleForPermissions(ResourceType.AGENT, RoleBits.EDITOR),
- ],
- );
-
- expect(byIdentifier?.permBits).toBe(RoleBits.EDITOR);
- expect(byPermissions?.permBits).toBe(RoleBits.EDITOR);
- });
- });
});
diff --git a/packages/data-schemas/src/methods/accessRole.ts b/packages/data-schemas/src/methods/accessRole.ts
index 13d6c3d225..b471ea0fec 100644
--- a/packages/data-schemas/src/methods/accessRole.ts
+++ b/packages/data-schemas/src/methods/accessRole.ts
@@ -1,4 +1,4 @@
-import { AccessRoleIds, ResourceType, PermissionBits } from 'librechat-data-provider';
+import { AccessRoleIds, ResourceType } from 'librechat-data-provider';
import type { Model, Types, DeleteResult } from 'mongoose';
import type { IAccessRole } from '~/types';
import { getTenantId, runAsSystem, SYSTEM_TENANT_ID } from '~/config/tenantContext';
@@ -11,18 +11,8 @@ export function createAccessRoleMethods(mongoose: typeof import('mongoose')): {
updateData: Partial<IAccessRole>,
) => Promise<IAccessRole | null>;
deleteRole: (accessRoleId: string | Types.ObjectId) => Promise<DeleteResult>;
- getAllRoles: () => Promise<IAccessRole[]>;
- findRoleById: (roleId: string | Types.ObjectId) => Promise<IAccessRole | null>;
seedDefaultRoles: () => Promise<Record<string, IAccessRole>>;
findRoleByIdentifier: (accessRoleId: string | Types.ObjectId) => Promise<IAccessRole | null>;
- getRoleForPermissions: (
- resourceType: string,
- permBits: PermissionBits | RoleBits,
- ) => Promise<IAccessRole | null>;
- findRoleByPermissions: (
- resourceType: string,
- permBits: PermissionBits | RoleBits,
- ) => Promise<IAccessRole | null>;
findRolesByResourceType: (resourceType: string) => Promise<IAccessRole[]>;
} {
/** True inside a tenant's own context; false with no context or a system one. */
@@ -73,16 +63,6 @@ export function createAccessRoleMethods(mongoose: typeof import('mongoose')): {
return [...rolesById.values()];
}
- /**
- * Find an access role by its ID
- * @param roleId - The role ID
- * @returns The role document or null if not found
- */
- async function findRoleById(roleId: string | Types.ObjectId): Promise<IAccessRole | null> {
- const AccessRole = mongoose.models.AccessRole as Model<IAccessRole>;
- return await AccessRole.findById(roleId).lean<IAccessRole>();
- }
-
/**
* Find an access role by its unique identifier
* @param accessRoleId - The unique identifier (e.g., "agent_viewer")
@@ -121,26 +101,6 @@ export function createAccessRoleMethods(mongoose: typeof import('mongoose')): {
return roles.filter((role) => role.resourceType === resourceType);
}
- /**
- * Find an access role by resource type and permission bits
- * @param resourceType - The type of resource
- * @param permBits - The permission bits (use PermissionBits or RoleBits enum)
- * @returns The role document or null if not found
- */
- async function findRoleByPermissions(
- resourceType: string,
- permBits: PermissionBits | RoleBits,
- ): Promise<IAccessRole | null> {
- const AccessRole = mongoose.models.AccessRole as Model<IAccessRole>;
- if (!inTenantScope()) {
- return await AccessRole.findOne({ resourceType, permBits }).lean<IAccessRole>().exec();
- }
- /** Selected from the visible set rather than queried directly, so a global role
- * whose identifier the tenant has redefined cannot match on its superseded bits. */
- const roles = await findRolesByResourceType(resourceType);
- return roles.find((role) => role.permBits === permBits) ?? null;
- }
-
/**
* Create a new access role
* @param roleData - Role data (accessRoleId, name, description, resourceType, permBits)
@@ -179,15 +139,6 @@ export function createAccessRoleMethods(mongoose: typeof import('mongoose')): {
return await AccessRole.deleteOne({ accessRoleId });
}
- /**
- * Get all predefined roles
- * @returns Array of all role documents
- */
- async function getAllRoles(): Promise<IAccessRole[]> {
- const AccessRole = mongoose.models.AccessRole as Model<IAccessRole>;
- return await AccessRole.find().lean<IAccessRole[]>();
- }
-
/**
* Seed default roles if they don't exist
* @returns Object containing created roles
@@ -354,43 +305,12 @@ export function createAccessRoleMethods(mongoose: typeof import('mongoose')): {
return result;
}
- /**
- * Helper to get the appropriate role for a set of permissions
- * @param resourceType - The type of resource
- * @param permBits - The permission bits
- * @returns The matching role or null if none found
- */
- async function getRoleForPermissions(
- resourceType: string,
- permBits: PermissionBits | RoleBits,
- ): Promise<IAccessRole | null> {
- /** Both matches come from the one visible set, so an exact hit on a global role
- * the tenant has redefined cannot win over the tenant's own definition. */
- const roles = await findRolesByResourceType(resourceType);
-
- const exactMatch = roles.find((role) => role.permBits === permBits);
- if (exactMatch) {
- return exactMatch;
- }
-
- /** If no exact match, the closest role without exceeding permissions */
- return (
- [...roles]
- .sort((a, b) => b.permBits - a.permBits)
- .find((role) => (role.permBits & permBits) === role.permBits) || null
- );
- }
-
return {
createRole,
updateRole,
deleteRole,
- getAllRoles,
- findRoleById,
seedDefaultRoles,
findRoleByIdentifier,
- getRoleForPermissions,
- findRoleByPermissions,
findRolesByResourceType,
};
}
diff --git a/packages/data-schemas/src/methods/aclEntry.spec.ts b/packages/data-schemas/src/methods/aclEntry.spec.ts
index a2dcbcf1c3..9b9a5c72aa 100644
--- a/packages/data-schemas/src/methods/aclEntry.spec.ts
+++ b/packages/data-schemas/src/methods/aclEntry.spec.ts
@@ -97,39 +97,6 @@ describe('AclEntry Model Tests', () => {
expect(entry?.principalModel).toBeUndefined();
});
- test('should find entries by principal', async () => {
- /** Create two different permissions for the same user */
- await methods.grantPermission(
- PrincipalType.USER,
- userId,
- ResourceType.AGENT,
- resourceId,
- PermissionBits.VIEW,
- grantedById,
- );
- await methods.grantPermission(
- PrincipalType.USER,
- userId,
- 'project',
- new mongoose.Types.ObjectId(),
- PermissionBits.EDIT,
- grantedById,
- );
-
- /** Find all entries for the user */
- const entries = await methods.findEntriesByPrincipal(PrincipalType.USER, userId);
- expect(entries).toHaveLength(2);
-
- /** Find entries filtered by resource type */
- const agentEntries = await methods.findEntriesByPrincipal(
- PrincipalType.USER,
- userId,
- ResourceType.AGENT,
- );
- expect(agentEntries).toHaveLength(1);
- expect(agentEntries[0].resourceType).toBe(ResourceType.AGENT);
- });
-
test('should find entries by resource', async () => {
/** Grant permissions to different principals for the same resource */
await methods.grantPermission(
@@ -312,35 +279,6 @@ describe('AclEntry Model Tests', () => {
});
describe('Permission Modification', () => {
- test('should revoke permission', async () => {
- /** Grant permission first */
- await methods.grantPermission(
- PrincipalType.USER,
- userId,
- ResourceType.AGENT,
- resourceId,
- PermissionBits.VIEW,
- grantedById,
- );
-
- /** Check it exists */
- const entriesBefore = await methods.findEntriesByPrincipal(PrincipalType.USER, userId);
- expect(entriesBefore).toHaveLength(1);
-
- /** Revoke it */
- const result = await methods.revokePermission(
- PrincipalType.USER,
- userId,
- ResourceType.AGENT,
- resourceId,
- );
- expect(result.deletedCount).toBe(1);
-
- /** Verify it's gone */
- const entriesAfter = await methods.findEntriesByPrincipal(PrincipalType.USER, userId);
- expect(entriesAfter).toHaveLength(0);
- });
-
test('should modify permission bits - add permissions', async () => {
/** Start with VIEW permission */
await methods.grantPermission(
@@ -476,32 +414,6 @@ describe('AclEntry Model Tests', () => {
expect(entry?.principalModel).toBe(PrincipalModel.ROLE);
});
- test('should handle string principalId in revokePermission', async () => {
- // First grant permission with ObjectId
- await methods.grantPermission(
- PrincipalType.USER,
- userId,
- ResourceType.AGENT,
- resourceId,
- PermissionBits.VIEW,
- grantedById,
- );
-
- // Then revoke with string ID
- const result = await methods.revokePermission(
- PrincipalType.USER,
- userId.toString(), // Pass string
- ResourceType.AGENT,
- resourceId,
- );
-
- expect(result.deletedCount).toBe(1);
-
- // Verify it's actually deleted
- const entries = await methods.findEntriesByPrincipal(PrincipalType.USER, userId);
- expect(entries).toHaveLength(0);
- });
-
test('should handle string principalId in modifyPermissionBits', async () => {
// First grant permission with ObjectId
await methods.grantPermission(
@@ -598,8 +510,11 @@ describe('AclEntry Model Tests', () => {
);
// Should still only be one entry
- const entries = await methods.findEntriesByPrincipal(PrincipalType.USER, userId);
- expect(entries).toHaveLength(1);
+ const entryCount = await AclEntry.countDocuments({
+ principalType: PrincipalType.USER,
+ principalId: userId,
+ });
+ expect(entryCount).toBe(1);
});
});
diff --git a/packages/data-schemas/src/methods/aclEntry.ts b/packages/data-schemas/src/methods/aclEntry.ts
index fdbbb71c79..31b1c62dd0 100644
--- a/packages/data-schemas/src/methods/aclEntry.ts
+++ b/packages/data-schemas/src/methods/aclEntry.ts
@@ -128,11 +128,6 @@ export const OWNER_ACL_PERMISSION_BIT_SUPERSETS: readonly number[] =
const OBJECT_ID_HEX = /^[0-9a-fA-F]{24}$/;
export function createAclEntryMethods(mongoose: typeof import('mongoose')): {
- findEntriesByPrincipal: (
- principalType: string,
- principalId: string | Types.ObjectId,
- resourceType?: string,
- ) => Promise<IAclEntry[]>;
findEntriesByResource: (
resourceType: string,
resourceId: string | Types.ObjectId,
@@ -172,13 +167,6 @@ export function createAclEntryMethods(mongoose: typeof import('mongoose')): {
roleId?: string | Types.ObjectId,
expiredAt?: Date,
) => Promise<IAclEntry | null>;
- revokePermission: (
- principalType: string,
- principalId: string | Types.ObjectId | null,
- resourceType: string,
- resourceId: string | Types.ObjectId,
- session?: ClientSession,
- ) => Promise<DeleteResult>;
modifyPermissionBits: (
principalType: string,
principalId: string | Types.ObjectId | null,
@@ -224,26 +212,6 @@ export function createAclEntryMethods(mongoose: typeof import('mongoose')): {
resourceTypes: string | string[],
) => Promise<Types.ObjectId[]>;
} {
- /**
- * Find ACL entries for a specific principal (user or group)
- * @param principalType - The type of principal ('user', 'group')
- * @param principalId - The ID of the principal
- * @param resourceType - Optional filter by resource type
- * @returns Array of ACL entries
- */
- async function findEntriesByPrincipal(
- principalType: string,
- principalId: string | Types.ObjectId,
- resourceType?: string,
- ): Promise<IAclEntry[]> {
- const AclEntry = mongoose.models.AclEntry as Model<IAclEntry>;
- const query: Record<string, unknown> = { principalType, principalId };
- if (resourceType) {
- query.resourceType = resourceType;
- }
- return await AclEntry.find(query).lean<IAclEntry[]>();
- }
-
/**
* Find ACL entries for a specific resource
* @param resourceType - The type of resource ('agent', 'project', 'file')
@@ -471,41 +439,6 @@ export function createAclEntryMethods(mongoose: typeof import('mongoose')): {
return await AclEntry.findOneAndUpdate(query, update, options);
}
- /**
- * Revoke permissions from a principal for a resource
- * @param principalType - The type of principal ('user', 'group', 'public')
- * @param principalId - The ID of the principal (null for 'public')
- * @param resourceType - The type of resource
- * @param resourceId - The ID of the resource
- * @param session - Optional MongoDB session for transactions
- * @returns The result of the delete operation
- */
- async function revokePermission(
- principalType: string,
- principalId: string | Types.ObjectId | null,
- resourceType: string,
- resourceId: string | Types.ObjectId,
- session?: ClientSession,
- ): Promise<DeleteResult> {
- const AclEntry = mongoose.models.AclEntry as Model<IAclEntry>;
- const query: Record<string, unknown> = {
- principalType,
- resourceType,
- resourceId,
- };
-
- if (principalType !== PrincipalType.PUBLIC) {
- query.principalId =
- typeof principalId === 'string' && principalType !== PrincipalType.ROLE
- ? new Types.ObjectId(principalId)
- : principalId;
- }
-
- const options = session ? { session } : {};
-
- return await AclEntry.deleteOne(query, options);
- }
-
/**
* Modify existing permission bits for a principal on a resource
* @param principalType - The type of principal ('user', 'group', 'public')
@@ -888,14 +821,12 @@ export function createAclEntryMethods(mongoose: typeof import('mongoose')): {
}
return {
- findEntriesByPrincipal,
findEntriesByResource,
findEntriesByPrincipalsAndResource,
hasPermission,
getEffectivePermissions,
getEffectivePermissionsForResources,
grantPermission,
- revokePermission,
modifyPermissionBits,
findAccessibleResources,
deleteAclEntries,
diff --git a/packages/data-schemas/src/methods/agentCategory.tenant.spec.ts b/packages/data-schemas/src/methods/agentCategory.tenant.spec.ts
index cccae345b9..3760b6f5ce 100644
--- a/packages/data-schemas/src/methods/agentCategory.tenant.spec.ts
+++ b/packages/data-schemas/src/methods/agentCategory.tenant.spec.ts
@@ -2,8 +2,8 @@ import mongoose from 'mongoose';
import { MongoMemoryServer } from 'mongodb-memory-server';
import type { IAgentCategory } from '..';
import { createAgentCategoryMethods } from './agentCategory';
-import { createModels } from '../models';
import { tenantStorage } from '../config/tenantContext';
+import { createModels } from '../models';
jest.mock('~/config/winston', () => ({
error: jest.fn(),
@@ -46,15 +46,15 @@ beforeEach(async () => {
await AgentCategory.deleteMany({});
});
-describe('getValidCategoryValues is scoped to the active tenant', () => {
+describe('getActiveCategories is scoped to the active tenant', () => {
it('returns only the current tenant category values', async () => {
await seedCategory(TENANT_A, 'alpha');
await seedCategory(TENANT_B, 'beta');
- const aValues = await runAs(TENANT_A, () => methods.getValidCategoryValues());
- expect(aValues).toEqual(['alpha']);
+ const aCategories = await runAs(TENANT_A, () => methods.getActiveCategories());
+ expect(aCategories.map((category) => category.value)).toEqual(['alpha']);
- const bValues = await runAs(TENANT_B, () => methods.getValidCategoryValues());
- expect(bValues).toEqual(['beta']);
+ const bCategories = await runAs(TENANT_B, () => methods.getActiveCategories());
+ expect(bCategories.map((category) => category.value)).toEqual(['beta']);
});
});
diff --git a/packages/data-schemas/src/methods/agentCategory.ts b/packages/data-schemas/src/methods/agentCategory.ts
index 751d4df1f7..5431e02ed1 100644
--- a/packages/data-schemas/src/methods/agentCategory.ts
+++ b/packages/data-schemas/src/methods/agentCategory.ts
@@ -1,28 +1,11 @@
-import type { Model, Types } from 'mongoose';
+import type { Model } from 'mongoose';
import type { IAgentCategory } from '~/types';
import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';
export function createAgentCategoryMethods(mongoose: typeof import('mongoose')): {
getActiveCategories: () => Promise<IAgentCategory[]>;
getCategoriesWithCounts: () => Promise<(IAgentCategory & { agentCount: number })[]>;
- getValidCategoryValues: () => Promise<string[]>;
- seedCategories: (
- categories: Array<{
- value: string;
- label?: string;
- description?: string;
- order?: number;
- custom?: boolean;
- }>,
- ) => Promise<import('mongoose').mongo.BulkWriteResult>;
- findCategoryByValue: (value: string) => Promise<IAgentCategory | null>;
createCategory: (categoryData: Partial<IAgentCategory>) => Promise<IAgentCategory>;
- updateCategory: (
- value: string,
- updateData: Partial<IAgentCategory>,
- ) => Promise<IAgentCategory | null>;
- deleteCategory: (value: string) => Promise<boolean>;
- findCategoryById: (id: string | Types.ObjectId) => Promise<IAgentCategory | null>;
getAllCategories: () => Promise<IAgentCategory[]>;
ensureDefaultCategories: () => Promise<boolean>;
} {
@@ -60,61 +43,6 @@ export function createAgentCategoryMethods(mongoose: typeof import('mongoose')):
})) as (IAgentCategory & { agentCount: number })[];
}
- /**
- * Get valid category values for Agent model validation
- * @returns Array of valid category values
- */
- async function getValidCategoryValues(): Promise<string[]> {
- const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
- return await AgentCategory.find({ isActive: true }).distinct('value').lean();
- }
-
- /**
- * Seed initial categories from existing constants
- * @param categories - Array of category data to seed
- * @returns Bulk write result
- */
- async function seedCategories(
- categories: Array<{
- value: string;
- label?: string;
- description?: string;
- order?: number;
- custom?: boolean;
- }>,
- ): Promise<import('mongoose').mongo.BulkWriteResult> {
- const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
-
- const operations = categories.map((category, index) => ({
- updateOne: {
- filter: { value: category.value },
- update: {
- $setOnInsert: {
- value: category.value,
- label: category.label || category.value,
- description: category.description || '',
- order: category.order || index,
- isActive: true,
- custom: category.custom || false,
- },
- },
- upsert: true,
- },
- }));
-
- return await tenantSafeBulkWrite(AgentCategory, operations);
- }
-
- /**
- * Find a category by value
- * @param value - The category value to search for
- * @returns The category document or null
- */
- async function findCategoryByValue(value: string): Promise<IAgentCategory | null> {
- const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
- return await AgentCategory.findOne({ value }).lean<IAgentCategory>();
- }
-
/**
* Create a new category
* @param categoryData - The category data to create
@@ -126,45 +54,6 @@ export function createAgentCategoryMethods(mongoose: typeof import('mongoose')):
return category.toObject() as IAgentCategory;
}
- /**
- * Update a category by value
- * @param value - The category value to update
- * @param updateData - The data to update
- * @returns The updated category or null
- */
- async function updateCategory(
- value: string,
- updateData: Partial<IAgentCategory>,
- ): Promise<IAgentCategory | null> {
- const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
- return await AgentCategory.findOneAndUpdate(
- { value },
- { $set: updateData },
- { new: true, runValidators: true },
- ).lean<IAgentCategory>();
- }
-
- /**
- * Delete a category by value
- * @param value - The category value to delete
- * @returns Whether the deletion was successful
- */
- async function deleteCategory(value: string): Promise<boolean> {
- const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
- const result = await AgentCategory.deleteOne({ value });
- return result.deletedCount > 0;
- }
-
- /**
- * Find a category by ID
- * @param id - The category ID to search for
- * @returns The category document or null
- */
- async function findCategoryById(id: string | Types.ObjectId): Promise<IAgentCategory | null> {
- const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
- return await AgentCategory.findById(id).lean<IAgentCategory>();
- }
-
/**
* Get all categories (active and inactive)
* @returns Array of all categories
@@ -278,13 +167,7 @@ export function createAgentCategoryMethods(mongoose: typeof import('mongoose')):
return {
getActiveCategories,
getCategoriesWithCounts,
- getValidCategoryValues,
- seedCategories,
- findCategoryByValue,
createCategory,
- updateCategory,
- deleteCategory,
- findCategoryById,
getAllCategories,
ensureDefaultCategories,
};
diff --git a/packages/data-schemas/src/methods/chatProject.spec.ts b/packages/data-schemas/src/methods/chatProject.spec.ts
index 7f91403afb..cdced4efa0 100644
--- a/packages/data-schemas/src/methods/chatProject.spec.ts
+++ b/packages/data-schemas/src/methods/chatProject.spec.ts
@@ -8,6 +8,7 @@ import {
import type { IChatProject, IConversation, IMongoFile } from '~/types';
import {
createChatProjectMethods,
+ refreshChatProjectStatsForUser,
updateChatProjectLastConversationForUser,
type ChatProjectMethods,
} from './chatProject';
@@ -263,7 +264,7 @@ describe('ChatProject methods', () => {
},
]);
- const refreshedProject = await methods.refreshChatProjectStats(user, chatProjectId);
+ const refreshedProject = await refreshChatProjectStatsForUser(mongoose, user, chatProjectId);
expect(refreshedProject?.conversationCount).toBe(1);
expect(refreshedProject?.lastConversationId).toBe('visible-convo');
@@ -321,7 +322,7 @@ describe('ChatProject methods', () => {
});
try {
- const refreshed = await methods.refreshChatProjectStats(user, chatProjectId);
+ const refreshed = await refreshChatProjectStatsForUser(mongoose, user, chatProjectId);
expect(refreshed?.conversationCount).toBe(2);
expect(refreshed?.lastConversationId).toBe('newer-convo');
@@ -369,7 +370,7 @@ describe('ChatProject methods', () => {
});
try {
- const refreshed = await methods.refreshChatProjectStats(user, chatProjectId);
+ const refreshed = await refreshChatProjectStatsForUser(mongoose, user, chatProjectId);
expect(refreshed?.conversationCount).toBe(0);
expect(refreshed?.lastConversationId).toBeNull();
expect(casAttempts).toBeGreaterThan(3);
@@ -398,7 +399,7 @@ describe('ChatProject methods', () => {
);
try {
- await expect(methods.refreshChatProjectStats(user, chatProjectId)).rejects.toThrow(
+ await expect(refreshChatProjectStatsForUser(mongoose, user, chatProjectId)).rejects.toThrow(
/refresh chat project stats/i,
);
} finally {
@@ -424,7 +425,7 @@ describe('ChatProject methods', () => {
updatedAt: createdAt,
});
- const refreshed = await methods.refreshChatProjectStats(user, chatProjectId);
+ const refreshed = await refreshChatProjectStatsForUser(mongoose, user, chatProjectId);
expect(refreshed?.conversationCount).toBe(1);
expect(refreshed?.lastConversationId).toBe('new-convo');
@@ -470,7 +471,7 @@ describe('ChatProject methods', () => {
updatedAt: newerAt,
},
]);
- await methods.refreshChatProjectStats(user, chatProjectId);
+ await refreshChatProjectStatsForUser(mongoose, user, chatProjectId);
await updateChatProjectLastConversationForUser(
mongoose,
diff --git a/packages/data-schemas/src/methods/chatProject.ts b/packages/data-schemas/src/methods/chatProject.ts
index 815c9d4716..144f24d61b 100644
--- a/packages/data-schemas/src/methods/chatProject.ts
+++ b/packages/data-schemas/src/methods/chatProject.ts
@@ -87,7 +87,6 @@ export interface ChatProjectMethods {
conversationId: string,
projectId: string | null,
): Promise<AssignConversationToProjectResult | null>;
- refreshChatProjectStats(user: string, projectId: string): Promise<IChatProject | null>;
}
type ProjectCursor = {
@@ -752,13 +751,6 @@ export function createChatProjectMethods(mongoose: typeof import('mongoose')): C
};
}
- async function refreshChatProjectStats(
- user: string,
- projectId: string,
- ): Promise<IChatProject | null> {
- return await refreshChatProjectStatsForUser(mongoose, user, projectId);
- }
-
return {
createChatProject,
getChatProject,
@@ -769,6 +761,5 @@ export function createChatProjectMethods(mongoose: typeof import('mongoose')): C
addChatProjectFile,
removeChatProjectFile,
assignConversationToProject,
- refreshChatProjectStats,
};
}
diff --git a/packages/data-schemas/src/methods/mcpServer.spec.ts b/packages/data-schemas/src/methods/mcpServer.spec.ts
index 29f1a0aa64..db5b08168d 100644
--- a/packages/data-schemas/src/methods/mcpServer.spec.ts
+++ b/packages/data-schemas/src/methods/mcpServer.spec.ts
@@ -345,69 +345,6 @@ describe('MCPServer Model Tests', () => {
});
});
- describe('findMCPServersByAuthor', () => {
- test('should find all servers by author', async () => {
- await methods.createMCPServer({
- config: createSSEConfig('Author Server 1'),
- author: authorId,
- });
- await methods.createMCPServer({
- config: createSSEConfig('Author Server 2'),
- author: authorId,
- });
- await methods.createMCPServer({
- config: createSSEConfig('Other Author Server'),
- author: authorId2,
- });
-
- const servers = await methods.findMCPServersByAuthor(authorId);
-
- expect(servers).toHaveLength(2);
- expect(servers.every((s) => s.author.toString() === authorId.toString())).toBe(true);
- });
-
- test('should return empty array when author has no servers', async () => {
- const servers = await methods.findMCPServersByAuthor(new mongoose.Types.ObjectId());
-
- expect(servers).toEqual([]);
- });
-
- test('should sort by updatedAt descending', async () => {
- // Create servers with slight delay to ensure different timestamps
- const server1 = await methods.createMCPServer({
- config: createSSEConfig('First Created'),
- author: authorId,
- });
-
- // Update first server to make it most recently updated
- await MCPServer.findByIdAndUpdate(server1._id, {
- $set: { 'config.description': 'Updated' },
- });
-
- await methods.createMCPServer({
- config: createSSEConfig('Second Created'),
- author: authorId,
- });
-
- const servers = await methods.findMCPServersByAuthor(authorId);
-
- expect(servers).toHaveLength(2);
- // Most recently updated should come first
- expect(servers[0].serverName).toBe('second-created');
- });
-
- test('should handle string author ID', async () => {
- await methods.createMCPServer({
- config: createSSEConfig('String Author Server'),
- author: authorId,
- });
-
- const servers = await methods.findMCPServersByAuthor(authorId.toString());
-
- expect(servers).toHaveLength(1);
- });
- });
-
describe('getListMCPServersByIds', () => {
let server1: t.MCPServerDocument;
let server2: t.MCPServerDocument;
diff --git a/packages/data-schemas/src/methods/mcpServer.ts b/packages/data-schemas/src/methods/mcpServer.ts
index 051bc665d1..bd83296503 100644
--- a/packages/data-schemas/src/methods/mcpServer.ts
+++ b/packages/data-schemas/src/methods/mcpServer.ts
@@ -76,7 +76,6 @@ export function createMCPServerMethods(
}) => Promise<MCPServerDocument>;
findMCPServerByServerName: (serverName: string) => Promise<MCPServerDocument | null>;
findMCPServerByObjectId: (_id: string | Types.ObjectId) => Promise<MCPServerDocument | null>;
- findMCPServersByAuthor: (authorId: string | Types.ObjectId) => Promise<MCPServerDocument[]>;
getListMCPServersByIds: ({
ids,
otherParams,
@@ -228,20 +227,6 @@ export function createMCPServerMethods(
return await MCPServer.findById(_id).lean<MCPServerDocument>();
}
- /**
- * Find MCP servers by author
- * @param authorId - The author's ObjectId or string
- * @returns Array of MCP server documents
- */
- async function findMCPServersByAuthor(
- authorId: string | Types.ObjectId,
- ): Promise<MCPServerDocument[]> {
- const MCPServer = mongoose.models.MCPServer as Model<MCPServerDocument>;
- return await MCPServer.find({ author: authorId })
- .sort({ updatedAt: -1 })
- .lean<MCPServerDocument[]>();
- }
-
/**
* Get a paginated list of MCP servers by IDs with filtering and search
* @param ids - Array of ObjectIds to include
@@ -493,7 +478,6 @@ export function createMCPServerMethods(
createMCPServer,
findMCPServerByServerName,
findMCPServerByObjectId,
- findMCPServersByAuthor,
getListMCPServersByIds,
getListMCPServersByNames,
updateMCPServer,
diff --git a/packages/data-schemas/src/methods/message.privateText.spec.ts b/packages/data-schemas/src/methods/message.privateText.spec.ts
index 816e1b8198..d1c126ac8e 100644
--- a/packages/data-schemas/src/methods/message.privateText.spec.ts
+++ b/packages/data-schemas/src/methods/message.privateText.spec.ts
@@ -288,75 +288,62 @@ it('strips private fields from bulk copies, including overwrites of protected ro
});
});
-it.each([
- 'updateMessage',
- 'updateMessageWithProvenance',
- 'updateMessageText',
- 'saveMessage',
- 'recordMessage',
-])('removes stored private text atomically when %s rewrites text', async (method) => {
- await tenant('tenant-a', async () => {
- const conversationId = uuid();
- const messageId = uuid();
- await methods.saveMessage(
- { userId: 'owner' },
- { conversationId, messageId, text: '[EMAIL_1]', isCreatedByUser: true },
- { privateText: { envelope: 'v1:owner', revision: 'original' } },
- );
- if (method === 'updateMessage' || method === 'updateMessageWithProvenance') {
- const updated = await methods.updateMessage('owner', {
- messageId,
- text: 'clean edited',
- ...(method === 'updateMessageWithProvenance' && { userSubmittedPaths: ['/text'] }),
- });
- expect(updated).not.toHaveProperty('privacyRevision');
- } else if (method === 'updateMessageText') {
- await methods.updateMessageText('owner', { messageId, text: 'clean edited' });
- } else if (method === 'recordMessage') {
- await methods.recordMessage({
- user: 'owner',
- conversationId,
- messageId,
- text: 'clean edited',
- isCreatedByUser: true,
- });
- } else {
+it.each(['updateMessage', 'updateMessageWithProvenance', 'saveMessage'])(
+ 'removes stored private text atomically when %s rewrites text',
+ async (method) => {
+ await tenant('tenant-a', async () => {
+ const conversationId = uuid();
+ const messageId = uuid();
await methods.saveMessage(
{ userId: 'owner' },
- {
- conversationId,
+ { conversationId, messageId, text: '[EMAIL_1]', isCreatedByUser: true },
+ { privateText: { envelope: 'v1:owner', revision: 'original' } },
+ );
+ if (method === 'updateMessage' || method === 'updateMessageWithProvenance') {
+ const updated = await methods.updateMessage('owner', {
messageId,
text: 'clean edited',
- isCreatedByUser: true,
- },
- );
- }
- const stored = await mongoose.models.Message.findOne({ conversationId, messageId })
- .select('+privateText')
- .lean();
- expect(stored).toMatchObject({ text: 'clean edited' });
- expect(stored).not.toHaveProperty('privateText');
- expect(stored).not.toHaveProperty('privacyRevision');
- expect(
- await methods.getPrivateMessageTexts({
- userId: 'owner',
- tenantId: 'tenant-a',
- conversationId,
- messageIds: [messageId],
- }),
- ).toEqual([]);
- expect(
- await methods.hasPersistedPrivateText({
- userId: 'owner',
- tenantId: 'tenant-a',
- conversationId,
- messageId,
- text: '[EMAIL_1]',
- privacyRevision: 'turn',
- }),
- ).toBe(false);
- });
-});
+ ...(method === 'updateMessageWithProvenance' && { userSubmittedPaths: ['/text'] }),
+ });
+ expect(updated).not.toHaveProperty('privacyRevision');
+ } else {
+ await methods.saveMessage(
+ { userId: 'owner' },
+ {
+ conversationId,
+ messageId,
+ text: 'clean edited',
+ isCreatedByUser: true,
+ },
+ );
+ }
+ const stored = await mongoose.models.Message.findOne({ conversationId, messageId })
+ .select('+privateText')
+ .lean();
+ expect(stored).toMatchObject({ text: 'clean edited' });
+ expect(stored).not.toHaveProperty('privateText');
+ expect(stored).not.toHaveProperty('privacyRevision');
+ expect(
+ await methods.getPrivateMessageTexts({
+ userId: 'owner',
+ tenantId: 'tenant-a',
+ conversationId,
+ messageIds: [messageId],
+ }),
+ ).toEqual([]);
+ expect(
+ await methods.hasPersistedPrivateText({
+ userId: 'owner',
+ tenantId: 'tenant-a',
+ conversationId,
+ messageId,
+ text: '[EMAIL_1]',
+ privacyRevision: 'turn',
+ }),
+ ).toBe(false);
+ });
+ },
+);
it('persists native-copy token provenance only from metadata and clears it on canonical edits', async () => {
const token = `[EMAIL_1_${'a'.repeat(32)}]`;
@@ -391,14 +378,14 @@ it('persists native-copy token provenance only from metadata and clears it on ca
(await methods.getMessages({ messageId, user: 'owner' }, select))[0],
).not.toHaveProperty('privateTextTokens');
}
- await methods.updateMessageText('owner', { messageId, text: 'Clean edit' });
+ await methods.updateMessage('owner', { messageId, text: 'Clean edit' });
expect(
(await methods.getMessages({ messageId, user: 'owner' }, '+privateTextTokens'))[0],
).not.toHaveProperty('privateTextTokens');
});
});
-it.each(['saveMessage', 'recordMessage', 'updateMessage', 'bulkSaveMessages'] as const)(
+it.each(['saveMessage', 'updateMessage', 'bulkSaveMessages'] as const)(
'clears native-copy provenance when %s overwrites canonical text',
async (writer) => {
const token = `[EMAIL_1_${'a'.repeat(32)}]`;
@@ -419,8 +406,6 @@ it.each(['saveMessage', 'recordMessage', 'updateMessage', 'bulkSaveMessages'] as
};
if (writer === 'saveMessage') {
await methods.saveMessage({ userId: 'owner' }, edited);
- } else if (writer === 'recordMessage') {
- await methods.recordMessage({ user: 'owner', ...edited });
} else if (writer === 'updateMessage') {
await methods.updateMessage('owner', edited);
} else {
diff --git a/packages/data-schemas/src/methods/message.spec.ts b/packages/data-schemas/src/methods/message.spec.ts
index 3b87bbf478..aeddac7f10 100644
--- a/packages/data-schemas/src/methods/message.spec.ts
+++ b/packages/data-schemas/src/methods/message.spec.ts
@@ -44,9 +44,6 @@ let updateMessage: ReturnType<typeof createMessageMethods>['updateMessage'];
let updateToolCallResult: ReturnType<typeof createMessageMethods>['updateToolCallResult'];
let deleteMessages: ReturnType<typeof createMessageMethods>['deleteMessages'];
let bulkSaveMessages: ReturnType<typeof createMessageMethods>['bulkSaveMessages'];
-let updateMessageText: ReturnType<typeof createMessageMethods>['updateMessageText'];
-let deleteMessagesSince: ReturnType<typeof createMessageMethods>['deleteMessagesSince'];
-let recordMessage: ReturnType<typeof createMessageMethods>['recordMessage'];
let claimSubagentTaskResult: ReturnType<typeof createMessageMethods>['claimSubagentTaskResult'];
let recordSubagentTaskControlReceipt: ReturnType<
typeof createMessageMethods
@@ -95,9 +92,6 @@ beforeAll(async () => {
updateToolCallResult = methods.updateToolCallResult;
deleteMessages = methods.deleteMessages;
bulkSaveMessages = methods.bulkSaveMessages;
- updateMessageText = methods.updateMessageText;
- deleteMessagesSince = methods.deleteMessagesSince;
- recordMessage = methods.recordMessage;
claimSubagentTaskResult = methods.claimSubagentTaskResult;
recordSubagentTaskControlReceipt = methods.recordSubagentTaskControlReceipt;
getSubagentTaskControlReceipt = methods.getSubagentTaskControlReceipt;
@@ -354,7 +348,7 @@ describe('Message Operations', () => {
expect(configReads).toBeGreaterThan(0);
});
- it.each(['record', 'edit', 'bulk', 'text'] as const)(
+ it.each(['edit', 'bulk'] as const)(
'applies the same configurable limit through the %s writer',
async (writer) => {
const methods = createMessageMethods(mongoose, {
@@ -366,19 +360,10 @@ describe('Message Operations', () => {
};
await methods.saveMessage(mockCtx, base);
const text = 'result'.repeat(15_000);
- if (writer === 'record')
- await methods.recordMessage({
- conversationId: mockMessageData.conversationId,
- user: 'user123',
- messageId: 'msg123',
- text,
- });
if (writer === 'edit')
await methods.updateMessage('user123', { messageId: 'msg123', text });
if (writer === 'bulk')
await methods.bulkSaveMessages([{ ...mockMessageData, user: 'user123', text }]);
- if (writer === 'text')
- await methods.updateMessageText('user123', { messageId: 'msg123', text });
const row = await Message.findOne({ messageId: 'msg123' }).lean();
expect(row?.text).toBe(text);
expect(mongoose.mongo.BSON.calculateObjectSize(row!)).toBeLessThanOrEqual(150_000);
@@ -1011,31 +996,9 @@ describe('Message Operations', () => {
});
});
- describe('recordMessage', () => {
- it('stamps native model output without overriding explicit provenance', async () => {
- const conversationId = uuidv4();
- const modelOutput = await recordMessage({
- user: 'user123',
- messageId: 'record-model-output',
- conversationId,
- isCreatedByUser: false,
- });
- expect(modelOutput?.isUserSubmitted).toBe(false);
-
- const explicitlySubmitted = await recordMessage({
- user: 'user123',
- messageId: 'record-user-submitted',
- conversationId,
- isCreatedByUser: false,
- isUserSubmitted: true,
- });
- expect(explicitlySubmitted?.isUserSubmitted).toBe(true);
- });
- });
-
it('preserves unknown provenance when message savers update legacy assistant rows', async () => {
const conversationId = uuidv4();
- const messageIds = ['legacy-save', 'legacy-bulk', 'legacy-record'];
+ const messageIds = ['legacy-save', 'legacy-bulk'];
await Message.collection.insertMany(
messageIds.map((messageId) => ({
user: 'user123',
@@ -1061,35 +1024,13 @@ describe('Message Operations', () => {
text: 'Updated assistant output',
},
]);
- await recordMessage({
- user: 'user123',
- messageId: 'legacy-record',
- conversationId,
- isCreatedByUser: false,
- text: 'Updated assistant output',
- });
-
const rows = await Message.find({ messageId: { $in: messageIds } }).lean();
- expect(rows).toHaveLength(3);
+ expect(rows).toHaveLength(2);
for (const row of rows) {
expect(row).not.toHaveProperty('isUserSubmitted');
}
});
- describe('updateMessageText', () => {
- it('should update message text for the authenticated user', async () => {
- // First save a message
- await saveMessage(mockCtx, mockMessageData);
-
- // Then update it
- await updateMessageText(mockCtx.userId, { messageId: 'msg123', text: 'Updated text' });
-
- // Verify the update
- const updatedMessage = await Message.findOne({ messageId: 'msg123', user: 'user123' });
- expect(updatedMessage?.text).toBe('Updated text');
- });
- });
-
describe('updateMessage', () => {
it('should update a message for the authenticated user', async () => {
// First save a message
@@ -3060,57 +3001,6 @@ describe('Message Operations', () => {
});
});
- describe('deleteMessagesSince', () => {
- it('should delete messages only for the authenticated user', async () => {
- const conversationId = uuidv4();
-
- // Create multiple messages in the same conversation
- await saveMessage(mockCtx, {
- messageId: 'msg1',
- conversationId,
- text: 'First message',
- user: 'user123',
- });
-
- await saveMessage(mockCtx, {
- messageId: 'msg2',
- conversationId,
- text: 'Second message',
- user: 'user123',
- });
-
- await waitForTimestampTick();
-
- await saveMessage(mockCtx, {
- messageId: 'msg3',
- conversationId,
- text: 'Third message',
- user: 'user123',
- });
-
- // Delete messages since message2 (this should only delete messages created AFTER msg2)
- await deleteMessagesSince(mockCtx.userId, {
- messageId: 'msg2',
- conversationId,
- });
-
- // Verify msg1 and msg2 remain, msg3 is deleted
- const remainingMessages = await Message.find({ conversationId, user: 'user123' });
- expect(remainingMessages).toHaveLength(2);
- expect(remainingMessages.map((m) => m.messageId)).toContain('msg1');
- expect(remainingMessages.map((m) => m.messageId)).toContain('msg2');
- expect(remainingMessages.map((m) => m.messageId)).not.toContain('msg3');
- });
-
- it('should return undefined if no message is found', async () => {
- const result = await deleteMessagesSince(mockCtx.userId, {
- messageId: 'nonexistent',
- conversationId: 'convo123',
- });
- expect(result).toBeUndefined();
- });
- });
-
describe('CLIENT_MESSAGE_SELECT projection', () => {
it('strips server-internal fields and dead SERP verticals, keeping rendered data', async () => {
const conversationId = uuidv4();
@@ -4145,38 +4035,6 @@ describe('Message Operations', () => {
expect(originalMessage?.text).toBe('Victim message');
});
- it("should not allow deleting messages from another user's conversation", async () => {
- const victimConversationId = uuidv4();
- const victimMessageId = 'victim-msg-123';
-
- // Save a message as the victim
- await saveMessage(
- { userId: 'victim123' },
- {
- messageId: victimMessageId,
- conversationId: victimConversationId,
- text: 'Victim message',
- user: 'victim123',
- },
- );
-
- // Attacker tries to delete from victim's conversation
- const result = await deleteMessagesSince('attacker123', {
- messageId: victimMessageId,
- conversationId: victimConversationId,
- });
-
- expect(result).toBeUndefined();
-
- // Verify the victim's message still exists
- const victimMessage = await Message.findOne({
- messageId: victimMessageId,
- user: 'victim123',
- });
- expect(victimMessage).toBeTruthy();
- expect(victimMessage?.text).toBe('Victim message');
- });
-
it("should not allow inserting a new message into another user's conversation", async () => {
const victimConversationId = uuidv4();
@@ -5079,23 +4937,6 @@ describe('Message Operations', () => {
expect(doc?.tenantId).toBe('real-tenant');
});
- it('recordMessage should not write caller-supplied tenantId to the document', async () => {
- const messageId = uuidv4();
- const conversationId = uuidv4();
- await recordMessage({
- user: 'user123',
- messageId,
- conversationId,
- text: 'Record tenant test',
- tenantId: 'malicious-tenant',
- });
-
- const doc = await Message.findOne({ messageId }).lean();
- expect(doc).not.toBeNull();
- expect(doc?.text).toBe('Record tenant test');
- expect(doc?.tenantId).toBeUndefined();
- });
-
it('updateMessage should not write caller-supplied tenantId to the document', async () => {
const messageId = uuidv4();
const conversationId = uuidv4();
diff --git a/packages/data-schemas/src/methods/message.ts b/packages/data-schemas/src/methods/message.ts
index 66181b1b7c..37fa26033c 100644
--- a/packages/data-schemas/src/methods/message.ts
+++ b/packages/data-schemas/src/methods/message.ts
@@ -820,15 +820,6 @@ export interface MessageMethods {
overrideTimestamp?: boolean,
provenance?: { privateTextTokens: ReadonlyMap<string, readonly string[]> },
): Promise<unknown>;
- recordMessage(params: {
- user: string;
- endpoint?: string;
- messageId: string;
- conversationId?: string;
- parentMessageId?: string;
- [key: string]: unknown;
- }): Promise<IMessage | null>;
- updateMessageText(userId: string, params: { messageId: string; text: string }): Promise<void>;
updateToolCallResult(params: {
userId: string;
messageId: string;
@@ -915,10 +906,6 @@ export interface MessageMethods {
kind: 'manual' | 'wakeup';
claimId: string;
}): Promise<boolean>;
- deleteMessagesSince(
- userId: string,
- params: { messageId: string; conversationId: string },
- ): Promise<DeleteResult>;
getMessages(
filter: FilterQuery<IMessage>,
select?: string,
@@ -1531,83 +1518,6 @@ export function createMessageMethods(
}
}
- /**
- * Records a message in the database (no UUID validation).
- */
- async function recordMessage({
- user,
- endpoint,
- messageId,
- conversationId,
- parentMessageId,
- ...rest
- }: {
- user: string;
- endpoint?: string;
- messageId: string;
- conversationId?: string;
- parentMessageId?: string;
- [key: string]: unknown;
- }) {
- try {
- const provenance = capNormalizedProvenance(
- normalizeUserSubmittedPaths(rest.userSubmittedPaths),
- normalizeUserSubmittedMessageFieldPaths(rest.userSubmittedMessageFieldPaths),
- );
- const {
- userSubmittedPaths: _userSubmittedPaths,
- userSubmittedMessageFieldPaths: _userSubmittedMessageFieldPaths,
- ...safeRest
- } = rest;
- delete safeRest.privateText;
- delete safeRest.privacyRevision;
- delete safeRest.privateTextTokens;
- const message = {
- user,
- endpoint,
- messageId,
- conversationId,
- parentMessageId,
- ...safeRest,
- ...(provenance.userSubmittedPaths.length > 0 && {
- userSubmittedPaths: provenance.userSubmittedPaths,
- }),
- ...(provenance.userSubmittedMessageFieldPaths.length > 0 && {
- userSubmittedMessageFieldPaths: provenance.userSubmittedMessageFieldPaths,
- }),
- ...(provenance.promoteWholeMessage && { isUserSubmitted: true }),
- };
- return await writeMessage({ user, messageId }, message, {
- upsert: true,
- unsetPrivateText: Object.prototype.hasOwnProperty.call(safeRest, 'text'),
- stampModelOutputOnInsert:
- rest.isCreatedByUser === false && rest.isUserSubmitted === undefined,
- });
- } catch (err) {
- logger.error('Error recording message:', err);
- throw err;
- }
- }
-
- /**
- * Updates the text of a message.
- */
- async function updateMessageText(
- userId: string,
- { messageId, text }: { messageId: string; text: string },
- ) {
- try {
- await writeMessage(
- { messageId, user: userId },
- { text },
- { upsert: false, unsetPrivateText: true },
- );
- } catch (err) {
- logger.error('Error updating message text:', err);
- throw err;
- }
- }
-
/**
* Patches a persisted tool_call content part in place and appends attachments,
* for results that settle after the turn's message was finalized (background
@@ -3020,30 +2930,6 @@ export function createMessageMethods(
return result.modifiedCount === 1;
}
- /**
- * Deletes messages in a conversation since a specific message.
- */
- async function deleteMessagesSince(
- userId: string,
- { messageId, conversationId }: { messageId: string; conversationId: string },
- ) {
- try {
- const Message = mongoose.models.Message as Model<IMessage>;
- const message = await Message.findOne({ messageId, user: userId }).lean<IMessage>();
-
- if (message) {
- const query = Message.find({ conversationId, user: userId });
- return await query.deleteMany({
- createdAt: { $gt: message.createdAt },
- });
- }
- return undefined;
- } catch (err) {
- logger.error('Error deleting messages:', err);
- throw err;
- }
- }
-
/**
* Retrieves messages from the database.
*/
@@ -4360,8 +4246,6 @@ export function createMessageMethods(
getPrivateMessageTexts,
saveMessage,
bulkSaveMessages,
- recordMessage,
- updateMessageText,
updateToolCallResult,
claimBackgroundToolResults,
confirmBackgroundToolResultClaim,
@@ -4372,7 +4256,6 @@ export function createMessageMethods(
getSubagentTaskControlReplay,
claimSubagentTaskResult,
releaseSubagentTaskResultClaim,
- deleteMessagesSince,
getMessages,
getConversationTraceRefs,
hasSampledTraceMessage,
diff --git a/packages/data-schemas/src/methods/preset.ts b/packages/data-schemas/src/methods/preset.ts
index 300c96c5e8..559e2de2d6 100644
--- a/packages/data-schemas/src/methods/preset.ts
+++ b/packages/data-schemas/src/methods/preset.ts
@@ -12,35 +12,6 @@ interface IPreset {
}
export function createPresetMethods(mongoose: typeof import('mongoose')): {
- getPreset: (
- user: string,
- presetId: string,
- ) => Promise<
- | (import('mongoose').FlattenMaps<{
- [x: string]: unknown;
- user?: string | undefined;
- presetId?: string | undefined;
- order?: number | undefined;
- defaultPreset?: boolean | undefined;
- tools?:
- | (
- | string
- | {
- pluginKey?: string | undefined;
- }
- )[]
- | undefined;
- updatedAt?: Date | undefined;
- }> & {
- _id: import('mongoose').Types.ObjectId;
- } & {
- __v: number;
- })
- | {
- message: string;
- }
- | null
- >;
getPresets: (
user: string,
filter?: Record<string, unknown>,
@@ -93,47 +64,6 @@ export function createPresetMethods(mongoose: typeof import('mongoose')): {
filter?: Record<string, unknown>,
) => Promise<import('mongodb').DeleteResult>;
} {
- /**
- * Retrieves a single preset by user and presetId.
- */
- async function getPreset(
- user: string,
- presetId: string,
- ): Promise<
- | (import('mongoose').FlattenMaps<{
- [x: string]: unknown;
- user?: string | undefined;
- presetId?: string | undefined;
- order?: number | undefined;
- defaultPreset?: boolean | undefined;
- tools?:
- | (
- | string
- | {
- pluginKey?: string | undefined;
- }
- )[]
- | undefined;
- updatedAt?: Date | undefined;
- }> & {
- _id: import('mongoose').Types.ObjectId;
- } & {
- __v: number;
- })
- | {
- message: string;
- }
- | null
- > {
- try {
- const Preset = mongoose.models.Preset as Model<IPreset>;
- return await Preset.findOne({ user, presetId }).lean();
- } catch (error) {
- logger.error('[getPreset] Error getting single preset', error);
- return { message: 'Error getting single preset' };
- }
- }
-
/**
* Retrieves all presets for a user, sorted by order then updatedAt.
*/
@@ -266,7 +196,6 @@ export function createPresetMethods(mongoose: typeof import('mongoose')): {
}
return {
- getPreset,
getPresets,
savePreset,
deletePresets,
diff --git a/packages/data-schemas/src/methods/prompt.ts b/packages/data-schemas/src/methods/prompt.ts
index f4b6ccc018..c17d026765 100644
--- a/packages/data-schemas/src/methods/prompt.ts
+++ b/packages/data-schemas/src/methods/prompt.ts
@@ -145,13 +145,6 @@ export interface PromptMethods {
}): Promise<{ prompt: IPromptRecord }>;
getPrompts(filter: Record<string, unknown>): Promise<IPromptRecord[]>;
getPrompt(filter: Record<string, unknown>): Promise<IPromptRecord | null>;
- getRandomPromptGroups(filter: {
- skip: number | string;
- limit: number | string;
- }): Promise<{ prompts: unknown[] } | { message: string }>;
- getPromptGroupsWithPrompts(
- filter: Record<string, unknown>,
- ): Promise<Record<string, unknown> | null | { message: string }>;
getPromptGroup(filter: Record<string, unknown>): Promise<Record<string, unknown> | null>;
getOwnedPromptGroupIds(author: string, readPrimary?: boolean): Promise<Types.ObjectId[]>;
getPromptGroupAccessContext(params: { userId: string; role?: string }): Promise<{
@@ -618,66 +611,6 @@ export function createPromptMethods(
return await Prompt.findOne(filter).lean<IPromptRecord>();
}
- /**
- * Get random prompt groups from distinct categories.
- */
- async function getRandomPromptGroups(filter: { skip: number | string; limit: number | string }) {
- try {
- const PromptGroup = mongoose.models.PromptGroup as Model<IPromptGroupDocument>;
- const categories = await PromptGroup.distinct('category', { category: { $ne: '' } });
-
- for (let i = categories.length - 1; i > 0; i--) {
- const j = Math.floor(Math.random() * (i + 1));
- [categories[i], categories[j]] = [categories[j], categories[i]];
- }
-
- const skip = +filter.skip;
- const limit = +filter.limit;
- const selectedCategories = categories.slice(skip, skip + limit);
-
- if (selectedCategories.length === 0) {
- return { prompts: [] };
- }
-
- const groups = await PromptGroup.find({ category: { $in: selectedCategories } }).lean();
-
- const groupByCategory = new Map<string, unknown>();
- for (const group of groups) {
- if (!groupByCategory.has(group.category)) {
- groupByCategory.set(group.category, group);
- }
- }
-
- const prompts = selectedCategories
- .map((cat: string) => groupByCategory.get(cat))
- .filter(Boolean);
-
- return { prompts };
- } catch (error) {
- logger.error('Error getting prompt groups', error);
- return { message: 'Error getting prompt groups' };
- }
- }
-
- /**
- * Get prompt groups with populated prompts.
- */
- async function getPromptGroupsWithPrompts(filter: Record<string, unknown>) {
- try {
- const PromptGroup = mongoose.models.PromptGroup as Model<IPromptGroupDocument>;
- return await PromptGroup.findOne(filter)
- .populate({
- path: 'prompts',
- select: '-_id -__v -user',
- })
- .select('-_id -__v -user')
- .lean();
- } catch (error) {
- logger.error('Error getting prompt groups', error);
- return { message: 'Error getting prompt groups' };
- }
- }
-
/**
* Get a single prompt group by filter, with productionPrompt populated via $lookup.
*/
@@ -1137,8 +1070,6 @@ export function createPromptMethods(
savePrompt,
getPrompts,
getPrompt,
- getRandomPromptGroups,
- getPromptGroupsWithPrompts,
getPromptGroup,
getOwnedPromptGroupIds,
getPromptGroupAccessContext,
diff --git a/packages/data-schemas/src/methods/queuedTurn.spec.ts b/packages/data-schemas/src/methods/queuedTurn.spec.ts
index 2cc1c6e379..96afb371f9 100644
--- a/packages/data-schemas/src/methods/queuedTurn.spec.ts
+++ b/packages/data-schemas/src/methods/queuedTurn.spec.ts
@@ -2422,7 +2422,7 @@ describe('agent queued turn methods', () => {
expect(receipts.map((turn) => turn.queuedTurnId)).not.toContain(deadIds[0]);
});
- it('isolates owner, tenant, and conversation scopes and drains or deletes exact scopes', async () => {
+ it('isolates owner, tenant, and conversation scopes and deletes exact scopes', async () => {
const otherUser = new mongoose.Types.ObjectId();
await Promise.all([
methods.enqueueAgentQueuedTurn(enqueueInput({ clientRequestId: 'keep', text: 'keep' })),
@@ -2442,14 +2442,6 @@ describe('agent queued turn methods', () => {
),
]);
- expect(
- await methods.drainAgentQueuedTurns({
- user,
- tenantId: 'tenant-1',
- conversationId: 'conversation-1',
- settledAt: START,
- }),
- ).toBe(1);
expect(
await methods.deleteAgentQueuedTurns({
user,
diff --git a/packages/data-schemas/src/methods/queuedTurn.ts b/packages/data-schemas/src/methods/queuedTurn.ts
index 07f66fc5cf..26c0ac4ddd 100644
--- a/packages/data-schemas/src/methods/queuedTurn.ts
+++ b/packages/data-schemas/src/methods/queuedTurn.ts
@@ -315,12 +315,6 @@ export interface AgentQueuedTurnMethods {
allowLegacyPredecessorInference?: boolean;
},
) => Promise<AgentQueuedTurnPredecessor | null>;
- drainAgentQueuedTurns: (
- input: AgentQueuedTurnOwnerScope & {
- conversationId?: string;
- settledAt?: Date;
- },
- ) => Promise<number>;
deleteAgentQueuedTurns: (
input: AgentQueuedTurnOwnerScope & { conversationId?: string },
) => Promise<number>;
@@ -2680,57 +2674,6 @@ export function createAgentQueuedTurnMethods(
};
}
- async function drainAgentQueuedTurns(
- input: AgentQueuedTurnOwnerScope & {
- conversationId?: string;
- settledAt?: Date;
- },
- ): Promise<number> {
- const settledAt = input.settledAt ?? new Date();
- const result = await Turn().updateMany(
- {
- ...ownerScope(input),
- ...(input.conversationId != null && {
- conversationId: requireBoundedString(input.conversationId, 256),
- }),
- status: { $in: ['queued', 'claimed'] },
- admissionStartedAt: { $exists: false },
- },
- {
- $set: {
- status: 'cancelled',
- terminalReceipt: {
- outcome: 'cancelled',
- settledAt,
- failure: {
- code: 'OWNER_DRAINED',
- message: 'Queued turn owner was drained',
- },
- },
- },
- $unset: {
- activeSlot: 1,
- admissionSlot: 1,
- claimId: 1,
- claimBy: 1,
- claimUntil: 1,
- },
- },
- );
- await Turn().updateMany(
- {
- ...ownerScope(input),
- ...(input.conversationId != null && {
- conversationId: requireBoundedString(input.conversationId, 256),
- }),
- status: 'cancelled',
- deliveryKey: { $exists: false },
- },
- { $set: { deliveryState: 'retired' } },
- );
- return result.modifiedCount;
- }
-
async function deleteAgentQueuedTurns(
input: AgentQueuedTurnOwnerScope & { conversationId?: string },
): Promise<number> {
@@ -3013,7 +2956,6 @@ export function createAgentQueuedTurnMethods(
hasAgentQueuedTurnAdmissionReceipt,
deadLetterAgentQueuedTurn,
getEffectiveAgentQueuedTurnPredecessor,
- drainAgentQueuedTurns,
deleteAgentQueuedTurns,
prepareAgentQueuedTurnConversationDeletion,
deletePreparedAgentQueuedTurnConversations,
diff --git a/packages/data-schemas/src/methods/role.ts b/packages/data-schemas/src/methods/role.ts
index dd12c1b813..3b9a24da9f 100644
--- a/packages/data-schemas/src/methods/role.ts
+++ b/packages/data-schemas/src/methods/role.ts
@@ -56,7 +56,6 @@ export function createRoleMethods(
permissionsUpdate: Record<string, Record<string, boolean>>,
roleData?: IRole,
) => Promise<void>;
- migrateRoleSchema: (roleName?: string) => Promise<number>;
createRoleByName: (roleData: Partial<IRole>) => Promise<IRole>;
deleteRoleByName: (roleName: string, options?: { id?: string }) => Promise<IRole | null>;
updateUsersByRole: (oldRole: string, newRole: string) => Promise<void>;
@@ -446,74 +445,6 @@ export function createRoleMethods(
}
}
- /**
- * Migrates roles from old schema to new schema structure.
- */
- async function migrateRoleSchema(roleName?: string): Promise<number> {
- try {
- const Role = mongoose.models.Role;
- let roles;
- if (roleName) {
- const role = await Role.findOne({ name: roleName });
- roles = role ? [role] : [];
- } else {
- roles = await Role.find({});
- }
-
- logger.info(`Migrating ${roles.length} roles to new schema structure`);
- let migratedCount = 0;
-
- for (const role of roles) {
- const permissionTypes = Object.keys(permissionsSchema.shape || {});
- const unsetFields: Record<string, number> = {};
- let hasOldSchema = false;
-
- for (const permType of permissionTypes) {
- if (role[permType] && typeof role[permType] === 'object') {
- hasOldSchema = true;
- role.permissions = role.permissions || {};
- role.permissions[permType] = {
- ...role.permissions[permType],
- ...role[permType],
- };
- unsetFields[permType] = 1;
- }
- }
-
- if (hasOldSchema) {
- try {
- logger.info(`Migrating role '${role.name}' from old schema structure`);
-
- await Role.updateOne(
- { _id: role._id },
- {
- $set: { permissions: role.permissions },
- $unset: unsetFields,
- },
- );
-
- const cache = deps.getCache?.(CacheKeys.ROLES);
- if (cache) {
- const updatedRole = await Role.findById(role._id).lean().exec();
- await cache.set(scopedCacheKey(role.name), updatedRole);
- }
-
- migratedCount++;
- logger.info(`Migrated role '${role.name}'`);
- } catch (error) {
- logger.error(`Failed to migrate role '${role.name}': ${(error as Error).message}`);
- }
- }
- }
-
- logger.info(`Migration complete: ${migratedCount} roles migrated`);
- return migratedCount;
- } catch (error) {
- logger.error(`Role schema migration failed: ${(error as Error).message}`);
- throw error;
- }
- }
-
/** Rejects names that match system roles. */
async function createRoleByName(roleData: Partial<IRole>): Promise<IRole> {
const { name } = roleData;
@@ -680,7 +611,6 @@ export function createRoleMethods(
findRolesByNames,
updateRoleByName,
updateAccessPermissions,
- migrateRoleSchema,
createRoleByName,
deleteRoleByName,
updateUsersByRole,
diff --git a/packages/data-schemas/src/methods/schedule.methods.spec.ts b/packages/data-schemas/src/methods/schedule.methods.spec.ts
index 2e31b70792..0659876f2c 100644
--- a/packages/data-schemas/src/methods/schedule.methods.spec.ts
+++ b/packages/data-schemas/src/methods/schedule.methods.spec.ts
@@ -442,7 +442,7 @@ describe('createScheduleWithSlot (atomic per-user cap)', () => {
const a = (await methods.createScheduleWithSlot(scheduleData({ user }), 2)) as ISchedule;
await methods.createScheduleWithSlot(scheduleData({ user }), 2);
expect(await methods.createScheduleWithSlot(scheduleData({ user }), 2)).toBe('limit');
- await methods.deleteScheduleById(a.id, user);
+ await Schedule.deleteOne({ _id: a._id });
const c = await methods.createScheduleWithSlot(scheduleData({ user }), 2);
expect(c).not.toBe('limit');
expect(await methods.countSchedulesByUser(user)).toBe(2);
diff --git a/packages/data-schemas/src/methods/schedule.ts b/packages/data-schemas/src/methods/schedule.ts
index edc5598143..e75857ee8a 100644
--- a/packages/data-schemas/src/methods/schedule.ts
+++ b/packages/data-schemas/src/methods/schedule.ts
@@ -164,12 +164,6 @@ export interface RecordRunOutcomeParams {
resumeClaimStaleBefore?: Date;
}
-/** Result of claiming/leasing a schedule: the snapshot plus the fencing token to carry. */
-export interface ScheduleClaim {
- schedule: ISchedule;
- claimToken: string;
-}
-
/** Outcome of reserving the single-active-run slot for a fired occurrence. */
export type StartedRunReservation =
| { run: IScheduleRun }
@@ -206,7 +200,6 @@ export type ScheduleMethods = {
unset?: Record<string, 1>,
options?: { expectedConfigRevision?: number; preserveMCPConsentRevision?: string },
) => Promise<ISchedule | null>;
- deleteScheduleById: (id: string, userId: string | Types.ObjectId) => Promise<boolean>;
deleteUnarmedSchedule: (
id: string,
userId: string | Types.ObjectId,
@@ -518,15 +511,6 @@ export function createScheduleMethods(mongoose: typeof import('mongoose')): Sche
.lean<ISchedule>();
}
- async function deleteScheduleById(id: string, userId: string | Types.ObjectId): Promise<boolean> {
- const result = await Schedule().deleteOne({ id, user: userId });
- if (result.deletedCount > 0) {
- await ScheduleRun().deleteMany({ scheduleId: id });
- return true;
- }
- return false;
- }
-
/**
* Rolls back a fresh create whose arming write failed — but ONLY while the row is
* still the unarmed, unedited revision this attempt inserted. An
@@ -2315,7 +2299,6 @@ export function createScheduleMethods(mongoose: typeof import('mongoose')): Sche
createSchedule,
createScheduleWithSlot,
updateScheduleById,
- deleteScheduleById,
deleteUnarmedSchedule,
getScheduleById,
getSchedulesByUser,
diff --git a/packages/data-schemas/src/methods/session.ts b/packages/data-schemas/src/methods/session.ts
index bc89c19bbe..f1c8cbb2f4 100644
--- a/packages/data-schemas/src/methods/session.ts
+++ b/packages/data-schemas/src/methods/session.ts
@@ -31,12 +31,6 @@ export function createSessionMethods(mongoose: typeof import('mongoose')): {
options: t.UpsertSessionOptions,
) => Promise<t.ISession>;
ensureSessionIndexes: () => Promise<void>;
- updateExpiration: (
- session: t.ISession | string,
- newExpiration?: Date,
- options?: t.UpdateExpirationOptions,
- ) => Promise<t.ISession>;
- countActiveSessions: (userId: string) => Promise<number>;
generateRefreshToken: (session: t.ISession) => Promise<string>;
deleteAllUserSessions: (
userId: string | { userId: string },
@@ -177,32 +171,6 @@ export function createSessionMethods(mongoose: typeof import('mongoose')): {
}
}
- /**
- * Updates session expiration
- */
- async function updateExpiration(
- session: t.ISession | string,
- newExpiration?: Date,
- options: t.UpdateExpirationOptions = {},
- ): Promise<t.ISession> {
- const expiresIn = options.expiresIn ?? DEFAULT_REFRESH_TOKEN_EXPIRY;
-
- try {
- const Session = mongoose.models.Session;
- const sessionDoc = typeof session === 'string' ? await Session.findById(session) : session;
-
- if (!sessionDoc) {
- throw new SessionError('Session not found', 'SESSION_NOT_FOUND');
- }
-
- sessionDoc.expiration = newExpiration || new Date(Date.now() + expiresIn);
- return await sessionDoc.save();
- } catch (error) {
- logger.error('[updateExpiration] Error updating session:', error);
- throw new SessionError('Failed to update session expiration', 'UPDATE_EXPIRATION_FAILED');
- }
- }
-
/**
* Deletes a session by refresh token or session ID
*/
@@ -319,26 +287,6 @@ export function createSessionMethods(mongoose: typeof import('mongoose')): {
}
}
- /**
- * Counts active sessions for a user
- */
- async function countActiveSessions(userId: string): Promise<number> {
- try {
- const Session = mongoose.models.Session;
- if (!userId) {
- throw new SessionError('User ID is required', 'INVALID_USER_ID');
- }
-
- return await Session.countDocuments({
- user: userId,
- expiration: { $gt: new Date() },
- });
- } catch (error) {
- logger.error('[countActiveSessions] Error counting active sessions:', error);
- throw new SessionError('Failed to count active sessions', 'COUNT_SESSIONS_FAILED');
- }
- }
-
return {
findSession,
SessionError,
@@ -346,8 +294,6 @@ export function createSessionMethods(mongoose: typeof import('mongoose')): {
createSession,
upsertSession,
ensureSessionIndexes,
- updateExpiration,
- countActiveSessions,
generateRefreshToken,
deleteAllUserSessions,
};
diff --git a/packages/data-schemas/src/methods/skill.ts b/packages/data-schemas/src/methods/skill.ts
index c02ecd6714..9a94db9a56 100644
--- a/packages/data-schemas/src/methods/skill.ts
+++ b/packages/data-schemas/src/methods/skill.ts
@@ -1003,30 +1003,6 @@ export async function filterExistingSkillIds(
return candidates.filter((id) => existing.has(id) || isExternalSkillId?.(id) === true);
}
-/**
- * Validate the `always-apply` value that would be derived from the
- * SKILL.md body's inline frontmatter. Only reports an issue when the
- * key is present with an unparseable value — absent / valid / empty
- * all pass silently so mid-edit saves that haven't touched the flag
- * yet don't get rejected. Wired into both `createSkill` and
- * `updateSkill` so a body PATCH carrying `always-apply: tru` (typo)
- * surfaces as 400 instead of drifting the indexed column.
- */
-export function validateAlwaysApplyInBody(body: string | undefined): ValidationIssue[] {
- const result = extractAlwaysApplyFromBody(body);
- if (result.status === 'invalid') {
- return [
- {
- field: 'body.frontmatter.alwaysApply',
- code: 'INVALID_TYPE',
- message:
- '"always-apply" or "alwaysApply" in SKILL.md frontmatter must be a boolean (true or false)',
- },
- ];
- }
- return [];
-}
-
export function createSkillMethods(
mongoose: typeof import('mongoose'),
deps: SkillDeps,
@@ -1623,7 +1599,7 @@ export function createSkillMethods(
`alwaysApply: true` would keep auto-priming after the user
removed the declaration from SKILL.md — a persistent,
invisible mismatch between the file and runtime behavior.
- `invalid` is rejected upstream by `validateAlwaysApplyInBody`
+ `invalid` is rejected by the inline check above
so this branch only handles the legitimate absence case. */
derivedAlwaysApply = false;
}
diff --git a/packages/data-schemas/src/methods/skillSync.spec.ts b/packages/data-schemas/src/methods/skillSync.spec.ts
index 82c1b53726..6438027076 100644
--- a/packages/data-schemas/src/methods/skillSync.spec.ts
+++ b/packages/data-schemas/src/methods/skillSync.spec.ts
@@ -219,8 +219,16 @@ describe('createSkillSyncMethods', () => {
errorCode: 'TENANT_B_FAILURE',
});
- const tenantA = await methods.getSkillSyncStatus('github', 'shared-source', 'tenant-a');
- const tenantB = await methods.getSkillSyncStatus('github', 'shared-source', 'tenant-b');
+ const tenantA = await mongoose.models.SkillSyncStatus.findOne({
+ provider: 'github',
+ sourceId: 'shared-source',
+ tenantId: 'tenant-a',
+ }).lean();
+ const tenantB = await mongoose.models.SkillSyncStatus.findOne({
+ provider: 'github',
+ sourceId: 'shared-source',
+ tenantId: 'tenant-b',
+ }).lean();
expect(tenantA).toMatchObject({
sourceId: 'shared-source',
diff --git a/packages/data-schemas/src/methods/skillSync.ts b/packages/data-schemas/src/methods/skillSync.ts
index 41dda74bf2..967c4baf85 100644
--- a/packages/data-schemas/src/methods/skillSync.ts
+++ b/packages/data-schemas/src/methods/skillSync.ts
@@ -85,11 +85,6 @@ export type SkillSyncMethods = {
credentialKey: string,
) => Promise<SkillSyncCredentialSummary | null>;
listSkillSyncStatuses: (provider: SkillSyncProvider) => Promise<ISkillSyncStatus[]>;
- getSkillSyncStatus: (
- provider: SkillSyncProvider,
- sourceId: string,
- tenantId?: string,
- ) => Promise<ISkillSyncStatus | null>;
upsertSkillSyncStatus: (input: SkillSyncStatusInput) => Promise<ISkillSyncStatus>;
tryAcquireSkillSyncLock: (params: SkillSyncLockInput) => Promise<boolean>;
refreshSkillSyncLock: (params: SkillSyncLockInput) => Promise<boolean>;
@@ -205,20 +200,6 @@ export function createSkillSyncMethods(mongoose: typeof import('mongoose')): Ski
return rows;
}
- async function getSkillSyncStatus(
- provider: SkillSyncProvider,
- sourceId: string,
- tenantId?: string,
- ): Promise<ISkillSyncStatus | null> {
- const Status = mongoose.models.SkillSyncStatus as Model<ISkillSyncStatusDocument>;
- const row = await Status.findOne({
- provider,
- sourceId,
- ...tenantStatusCondition(tenantId),
- }).lean<ISkillSyncStatus | null>();
- return row ?? null;
- }
-
async function upsertSkillSyncStatus(input: SkillSyncStatusInput): Promise<ISkillSyncStatus> {
const Status = mongoose.models.SkillSyncStatus as Model<ISkillSyncStatusDocument>;
const now = new Date();
@@ -385,7 +366,6 @@ export function createSkillSyncMethods(mongoose: typeof import('mongoose')): Ski
getSkillSyncCredentialToken,
getSkillSyncCredentialSummary,
listSkillSyncStatuses,
- getSkillSyncStatus,
upsertSkillSyncStatus,
tryAcquireSkillSyncLock,
refreshSkillSyncLock,
diff --git a/packages/data-schemas/src/methods/toolCall.ts b/packages/data-schemas/src/methods/toolCall.ts
index 5faba98a3b..9eb9b7498f 100644
--- a/packages/data-schemas/src/methods/toolCall.ts
+++ b/packages/data-schemas/src/methods/toolCall.ts
@@ -9,39 +9,10 @@ interface IToolCallData {
export function createToolCallMethods(mongoose: typeof import('mongoose')): {
createToolCall: (toolCallData: IToolCallData) => Promise<IToolCallData>;
- updateToolCall: (
- id: string,
- updateData: Partial<IToolCallData>,
- ) => Promise<
- | (import('mongoose').FlattenMaps<{
- [x: string]: unknown;
- messageId?: string | undefined;
- conversationId?: string | undefined;
- user?: string | undefined;
- }> & {
- _id: import('mongoose').Types.ObjectId;
- } & {
- __v: number;
- })
- | null
- >;
deleteToolCalls: (
userId: string,
conversationId?: string,
) => Promise<import('mongodb').DeleteResult>;
- getToolCallById: (id: string) => Promise<
- | (import('mongoose').FlattenMaps<{
- [x: string]: unknown;
- messageId?: string | undefined;
- conversationId?: string | undefined;
- user?: string | undefined;
- }> & {
- _id: import('mongoose').Types.ObjectId;
- } & {
- __v: number;
- })
- | null
- >;
getToolCallsByConvo: (
conversationId: string,
userId: string,
@@ -57,21 +28,6 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')): {
__v: number;
})[]
>;
- getToolCallsByMessage: (
- messageId: string,
- userId: string,
- ) => Promise<
- (import('mongoose').FlattenMaps<{
- [x: string]: unknown;
- messageId?: string | undefined;
- conversationId?: string | undefined;
- user?: string | undefined;
- }> & {
- _id: import('mongoose').Types.ObjectId;
- } & {
- __v: number;
- })[]
- >;
} {
/**
* Create a new tool call
@@ -85,56 +41,6 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')): {
}
}
- /**
- * Get a tool call by ID
- */
- async function getToolCallById(id: string): Promise<
- | (import('mongoose').FlattenMaps<{
- [x: string]: unknown;
- messageId?: string | undefined;
- conversationId?: string | undefined;
- user?: string | undefined;
- }> & {
- _id: import('mongoose').Types.ObjectId;
- } & {
- __v: number;
- })
- | null
- > {
- try {
- const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
- return await ToolCall.findById(id).lean();
- } catch (error) {
- throw new Error(`Error fetching tool call: ${(error as Error).message}`);
- }
- }
-
- /**
- * Get tool calls by message ID and user
- */
- async function getToolCallsByMessage(
- messageId: string,
- userId: string,
- ): Promise<
- (import('mongoose').FlattenMaps<{
- [x: string]: unknown;
- messageId?: string | undefined;
- conversationId?: string | undefined;
- user?: string | undefined;
- }> & {
- _id: import('mongoose').Types.ObjectId;
- } & {
- __v: number;
- })[]
- > {
- try {
- const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
- return await ToolCall.find({ messageId, user: userId }).lean();
- } catch (error) {
- throw new Error(`Error fetching tool calls: ${(error as Error).message}`);
- }
- }
-
/**
* Get tool calls by conversation ID and user
*/
@@ -161,33 +67,6 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')): {
}
}
- /**
- * Update a tool call
- */
- async function updateToolCall(
- id: string,
- updateData: Partial<IToolCallData>,
- ): Promise<
- | (import('mongoose').FlattenMaps<{
- [x: string]: unknown;
- messageId?: string | undefined;
- conversationId?: string | undefined;
- user?: string | undefined;
- }> & {
- _id: import('mongoose').Types.ObjectId;
- } & {
- __v: number;
- })
- | null
- > {
- try {
- const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
- return await ToolCall.findByIdAndUpdate(id, updateData, { new: true }).lean();
- } catch (error) {
- throw new Error(`Error updating tool call: ${(error as Error).message}`);
- }
- }
-
/**
* Delete tool calls by user and optionally conversation
*/
@@ -209,11 +88,8 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')): {
return {
createToolCall,
- updateToolCall,
deleteToolCalls,
- getToolCallById,
getToolCallsByConvo,
- getToolCallsByMessage,
};
}
diff --git a/packages/data-schemas/src/methods/userGroup.methods.spec.ts b/packages/data-schemas/src/methods/userGroup.methods.spec.ts
index 81e778b14a..22c8ed49b0 100644
--- a/packages/data-schemas/src/methods/userGroup.methods.spec.ts
+++ b/packages/data-schemas/src/methods/userGroup.methods.spec.ts
@@ -195,64 +195,6 @@ describe('UserGroup Methods - Detailed Tests', () => {
});
});
- describe('findGroupsByMemberId', () => {
- let user1: mongoose.HydratedDocument<t.IUser>;
-
- beforeEach(async () => {
- user1 = await User.create({
- name: 'User 1',
- email: '[email protected]',
- provider: 'local',
- });
- });
-
- test('should find groups by member ObjectId', async () => {
- await Group.create([
- {
- name: 'Group 1',
- source: 'local',
- memberIds: [(user1._id as mongoose.Types.ObjectId).toString(), 'other-user'],
- },
- {
- name: 'Group 2',
- source: 'local',
- memberIds: [(user1._id as mongoose.Types.ObjectId).toString()],
- },
- {
- name: 'Group 3',
- source: 'local',
- memberIds: ['other-user'],
- },
- ]);
-
- const groups = await methods.findGroupsByMemberId(user1._id as mongoose.Types.ObjectId);
-
- expect(groups).toHaveLength(2);
- expect(groups.map((g) => g.name).sort()).toEqual(['Group 1', 'Group 2']);
- });
-
- test('should find groups by member string ID', async () => {
- await Group.create([
- {
- name: 'Group 1',
- source: 'local',
- memberIds: [(user1._id as mongoose.Types.ObjectId).toString()],
- },
- ]);
-
- const groups = await methods.findGroupsByMemberId(user1._id as mongoose.Types.ObjectId);
-
- expect(groups).toHaveLength(1);
- expect(groups[0].name).toBe('Group 1');
- });
-
- test('should return empty array for user with no groups', async () => {
- const groups = await methods.findGroupsByMemberId(user1._id as mongoose.Types.ObjectId);
-
- expect(groups).toEqual([]);
- });
- });
-
describe('createGroup', () => {
test('should create a group with all fields', async () => {
const groupData: Partial<t.IGroup> = {
@@ -479,165 +421,6 @@ describe('UserGroup Methods - Detailed Tests', () => {
});
});
- describe('getUserGroups', () => {
- let user: mongoose.HydratedDocument<t.IUser>;
-
- beforeEach(async () => {
- user = await User.create({
- name: 'Test User',
- email: '[email protected]',
- provider: 'local',
- });
- });
-
- test('should get all groups for a user', async () => {
- // Create groups with user as member
- await Group.create([
- {
- name: 'Group 1',
- source: 'local',
- memberIds: [(user._id as mongoose.Types.ObjectId).toString()],
- },
- {
- name: 'Group 2',
- source: 'local',
- memberIds: [(user._id as mongoose.Types.ObjectId).toString(), 'other-user'],
- },
- {
- name: 'Group 3',
- source: 'local',
- memberIds: ['other-user'],
- },
- ]);
-
- const groups = await methods.getUserGroups(user._id as mongoose.Types.ObjectId);
-
- expect(groups).toHaveLength(2);
- expect(groups.map((g) => g.name).sort()).toEqual(['Group 1', 'Group 2']);
- });
-
- test('should return empty array for user with no groups', async () => {
- const groups = await methods.getUserGroups(user._id as mongoose.Types.ObjectId);
-
- expect(groups).toEqual([]);
- });
-
- test('should handle user with idOnTheSource', async () => {
- const externalUser = await User.create({
- name: 'External User',
- email: '[email protected]',
- provider: 'entra',
- idOnTheSource: 'external-456',
- });
-
- await Group.create({
- name: 'External Group',
- source: 'entra',
- idOnTheSource: 'entra-external-group',
- memberIds: ['external-456'], // Using idOnTheSource
- });
-
- const groups = await methods.getUserGroups(externalUser._id as mongoose.Types.ObjectId);
-
- expect(groups).toHaveLength(1);
- expect(groups[0].name).toBe('External Group');
- });
- });
-
- describe('syncUserEntraGroups', () => {
- let user: mongoose.HydratedDocument<t.IUser>;
-
- beforeEach(async () => {
- user = await User.create({
- name: 'Entra User',
- email: '[email protected]',
- provider: 'entra',
- idOnTheSource: 'entra-user-123',
- });
- });
-
- test('should create new groups and add user', async () => {
- const entraGroups = [
- { id: 'group-1', name: 'Entra Group 1' },
- { id: 'group-2', name: 'Entra Group 2' },
- ];
-
- const result = await methods.syncUserEntraGroups(
- user._id as mongoose.Types.ObjectId,
- entraGroups,
- );
-
- expect(result.user).toBeDefined();
- expect(result.addedGroups).toHaveLength(2);
- expect(result.removedGroups).toHaveLength(0);
-
- // Verify groups were created
- const groups = await Group.find({ source: 'entra' });
- expect(groups).toHaveLength(2);
-
- // Verify user is member of both
- for (const group of groups) {
- expect(group.memberIds).toContain('entra-user-123');
- }
- });
-
- test('should remove user from groups not in sync list', async () => {
- // Create existing groups
- const group1 = await Group.create({
- name: 'Keep Group',
- source: 'entra',
- idOnTheSource: 'keep-group',
- memberIds: ['entra-user-123'],
- });
-
- const group2 = await Group.create({
- name: 'Remove Group',
- source: 'entra',
- idOnTheSource: 'remove-group',
- memberIds: ['entra-user-123'],
- });
-
- // Sync with only one group
- const result = await methods.syncUserEntraGroups(user._id as mongoose.Types.ObjectId, [
- { id: 'keep-group', name: 'Keep Group' },
- ]);
-
- expect(result.addedGroups).toHaveLength(0);
- expect(result.removedGroups).toHaveLength(1);
-
- // Verify membership
- const keepGroup = await Group.findById(group1._id);
- const removeGroup = await Group.findById(group2._id);
-
- expect(keepGroup?.memberIds).toContain('entra-user-123');
- expect(removeGroup?.memberIds).not.toContain('entra-user-123');
- });
-
- test('should not affect local groups', async () => {
- // Create local group
- const localGroup = await Group.create({
- name: 'Local Group',
- source: 'local',
- memberIds: ['entra-user-123'],
- });
-
- // Sync entra groups
- await methods.syncUserEntraGroups(user._id as mongoose.Types.ObjectId, [
- { id: 'entra-group', name: 'Entra Group' },
- ]);
-
- // Verify local group unchanged
- const savedLocalGroup = await Group.findById(localGroup._id);
- expect(savedLocalGroup?.memberIds).toContain('entra-user-123');
- });
-
- test('should throw error for non-existent user', async () => {
- const fakeId = new mongoose.Types.ObjectId();
-
- await expect(methods.syncUserEntraGroups(fakeId, [])).rejects.toThrow('User not found');
- });
- });
-
describe('listGroups', () => {
beforeEach(async () => {
await Group.create([
diff --git a/packages/data-schemas/src/methods/userGroup.spec.ts b/packages/data-schemas/src/methods/userGroup.spec.ts
index 7a33ac633c..db3212e596 100644
--- a/packages/data-schemas/src/methods/userGroup.spec.ts
+++ b/packages/data-schemas/src/methods/userGroup.spec.ts
@@ -144,39 +144,6 @@ describe('userGroup methods', () => {
});
});
- describe('findGroupsByMemberId', () => {
- it('returns groups the user is a member of via idOnTheSource', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
- await Group.create([
- { name: 'Group A', source: 'local', memberIds: ['user-ext-1'] },
- { name: 'Group B', source: 'local', memberIds: ['user-ext-1'] },
- { name: 'Group C', source: 'local', memberIds: ['other-user'] },
- ]);
-
- const groups = await methods.findGroupsByMemberId(user._id);
- expect(groups).toHaveLength(2);
- const names = groups.map((g) => g.name).sort();
- expect(names).toEqual(['Group A', 'Group B']);
- });
-
- it('returns empty array when user does not exist', async () => {
- const groups = await methods.findGroupsByMemberId(new Types.ObjectId());
- expect(groups).toEqual([]);
- });
-
- it('falls back to userId string when user has no idOnTheSource', async () => {
- const user = await createTestUser();
- await Group.create({
- name: 'Group X',
- source: 'local',
- memberIds: [user._id.toString()],
- });
-
- const groups = await methods.findGroupsByMemberId(user._id);
- expect(groups).toHaveLength(1);
- });
- });
-
describe('createGroup', () => {
it('creates a group and returns the document', async () => {
const group = await methods.createGroup({ name: 'New Group', source: 'local' });
@@ -300,17 +267,6 @@ describe('userGroup methods', () => {
});
});
- describe('getUserGroups', () => {
- it('delegates to findGroupsByMemberId', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
- await Group.create({ name: 'Team', source: 'local', memberIds: ['user-ext-1'] });
-
- const groups = await methods.getUserGroups(user._id);
- expect(groups).toHaveLength(1);
- expect(groups[0].name).toBe('Team');
- });
- });
-
describe('getUserPrincipals', () => {
it('returns USER, ROLE, and PUBLIC principals', async () => {
const user = await createTestUser({ role: SystemRoles.ADMIN });
@@ -1264,129 +1220,6 @@ describe('userGroup methods', () => {
});
});
- describe('syncUserEntraGroups', () => {
- it('creates new groups and adds user as member', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
-
- const { addedGroups, removedGroups } = await methods.syncUserEntraGroups(user._id, [
- { id: 'entra-g1', name: 'Entra Group 1' },
- { id: 'entra-g2', name: 'Entra Group 2', description: 'desc', email: '[email protected]' },
- ]);
-
- expect(addedGroups).toHaveLength(2);
- expect(removedGroups).toHaveLength(0);
-
- const groups = await Group.find({ source: 'entra' });
- expect(groups).toHaveLength(2);
- expect(groups.every((g) => g.memberIds!.includes('user-ext-1'))).toBe(true);
- });
-
- it('adds user to existing group they are not a member of', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
- await Group.create({
- name: 'Existing Entra Group',
- source: 'entra',
- idOnTheSource: 'entra-g1',
- memberIds: ['other-user'],
- });
-
- const { addedGroups } = await methods.syncUserEntraGroups(user._id, [
- { id: 'entra-g1', name: 'Existing Entra Group' },
- ]);
-
- expect(addedGroups).toHaveLength(1);
- const group = await Group.findOne({ idOnTheSource: 'entra-g1' });
- expect(group!.memberIds).toContain('user-ext-1');
- expect(group!.memberIds).toContain('other-user');
- });
-
- it('skips groups the user is already a member of', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
- await Group.create({
- name: 'Already Member',
- source: 'entra',
- idOnTheSource: 'entra-g1',
- memberIds: ['user-ext-1'],
- });
-
- const { addedGroups } = await methods.syncUserEntraGroups(user._id, [
- { id: 'entra-g1', name: 'Already Member' },
- ]);
-
- expect(addedGroups).toHaveLength(0);
- });
-
- it('removes user from stale entra groups', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
- await Group.create({
- name: 'Stale Group',
- source: 'entra',
- idOnTheSource: 'entra-stale',
- memberIds: ['user-ext-1'],
- });
-
- const { removedGroups } = await methods.syncUserEntraGroups(user._id, []);
-
- expect(removedGroups).toHaveLength(1);
- expect(removedGroups[0].name).toBe('Stale Group');
- const group = await Group.findOne({ idOnTheSource: 'entra-stale' });
- expect(group!.memberIds).not.toContain('user-ext-1');
- });
-
- it('handles add-and-remove in one sync call', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
-
- await Group.create({
- name: 'Keep Group',
- source: 'entra',
- idOnTheSource: 'entra-keep',
- memberIds: ['user-ext-1'],
- });
- await Group.create({
- name: 'Remove Group',
- source: 'entra',
- idOnTheSource: 'entra-remove',
- memberIds: ['user-ext-1'],
- });
-
- const { addedGroups, removedGroups } = await methods.syncUserEntraGroups(user._id, [
- { id: 'entra-keep', name: 'Keep Group' },
- { id: 'entra-new', name: 'New Group' },
- ]);
-
- expect(addedGroups).toHaveLength(1);
- expect(addedGroups[0].name).toBe('New Group');
- expect(removedGroups).toHaveLength(1);
- expect(removedGroups[0].name).toBe('Remove Group');
- });
-
- it('preserves local groups during entra sync', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
- await Group.create({
- name: 'Local Group',
- source: 'local',
- memberIds: ['user-ext-1'],
- });
-
- await methods.syncUserEntraGroups(user._id, []);
-
- const localGroup = await Group.findOne({ name: 'Local Group' });
- expect(localGroup!.memberIds).toContain('user-ext-1');
- });
-
- it('throws when user does not exist', async () => {
- await expect(
- methods.syncUserEntraGroups(new Types.ObjectId(), [{ id: 'g1', name: 'Group' }]),
- ).rejects.toThrow(/User not found/);
- });
-
- it('returns the updated user document', async () => {
- const user = await createTestUser({ idOnTheSource: 'user-ext-1' });
- const { user: updatedUser } = await methods.syncUserEntraGroups(user._id, []);
- expect((updatedUser._id as Types.ObjectId).toString()).toBe(user._id.toString());
- });
- });
-
describe('calculateRelevanceScore', () => {
it('returns 100 for exact match', () => {
const score = methods.calculateRelevanceScore(
diff --git a/packages/data-schemas/src/methods/userGroup.ts b/packages/data-schemas/src/methods/userGroup.ts
index 2e3bc9827f..451f8e97c4 100644
--- a/packages/data-schemas/src/methods/userGroup.ts
+++ b/packages/data-schemas/src/methods/userGroup.ts
@@ -191,10 +191,6 @@ export function createUserGroupMethods(
limit?: number,
session?: ClientSession,
) => Promise<IGroup[]>;
- findGroupsByMemberId: (
- userId: string | Types.ObjectId,
- session?: ClientSession,
- ) => Promise<IGroup[]>;
createGroup: (groupData: Partial<IGroup>, session?: ClientSession) => Promise<IGroup>;
upsertGroupByExternalId: (
idOnTheSource: string,
@@ -232,7 +228,6 @@ export function createUserGroupMethods(
update: Record<string, unknown>,
options?: { session?: ClientSession },
) => Promise<import('mongoose').UpdateWriteOpResult>;
- getUserGroups: (userId: string | Types.ObjectId, session?: ClientSession) => Promise<IGroup[]>;
getUserPrincipals: (
params: {
userId: string | Types.ObjectId;
@@ -241,15 +236,6 @@ export function createUserGroupMethods(
},
session?: ClientSession,
) => Promise<Array<{ principalType: PrincipalType; principalId?: string | Types.ObjectId }>>;
- syncUserEntraGroups: (
- userId: string | Types.ObjectId,
- entraGroups: Array<{ id: string; name: string; description?: string; email?: string }>,
- session?: ClientSession,
- ) => Promise<{
- user: IUser;
- addedGroups: IGroup[];
- removedGroups: IGroup[];
- }>;
searchPrincipals: (
searchPattern: string,
limitPerType?: number,
@@ -651,38 +637,6 @@ export function createUserGroupMethods(
return await dbQuery.lean<IGroup[]>();
}
- /**
- * Find all groups a user is a member of by their ID or idOnTheSource
- * @param userId - The user ID
- * @param session - Optional MongoDB session for transactions
- * @returns Array of groups the user is a member of
- */
- async function findGroupsByMemberId(
- userId: string | Types.ObjectId,
- session?: ClientSession,
- ): Promise<IGroup[]> {
- const User = mongoose.models.User as Model<IUser>;
- const Group = mongoose.models.Group as Model<IGroup>;
-
- const userQuery = User.findById(userId, 'idOnTheSource');
- if (session) {
- userQuery.session(session);
- }
- const user = await userQuery.lean<{ idOnTheSource?: string }>();
-
- if (!user) {
- return [];
- }
-
- const userIdOnTheSource = user.idOnTheSource || userId.toString();
-
- const query = Group.find({ memberIds: userIdOnTheSource });
- if (session) {
- query.session(session);
- }
- return await query.lean<IGroup[]>();
- }
-
/**
* Create a new group
* @param groupData - Group data including name, source, and optional idOnTheSource
@@ -824,19 +778,6 @@ export function createUserGroupMethods(
return { user: user as IUser, group: updatedGroup, changed: changedGroup != null };
}
- /**
- * Get all groups a user is a member of
- * @param userId - The user ID
- * @param session - Optional MongoDB session for transactions
- * @returns Array of group documents
- */
- async function getUserGroups(
- userId: string | Types.ObjectId,
- session?: ClientSession,
- ): Promise<IGroup[]> {
- return await findGroupsByMemberId(userId, session);
- }
-
/**
* Get a list of all principal identifiers for a user (user ID + group IDs + public).
* For use in permission checks.
@@ -921,109 +862,6 @@ export function createUserGroupMethods(
return principals;
}
- /**
- * Sync a user's Entra ID group memberships
- * @param userId - The user ID
- * @param entraGroups - Array of Entra groups with id and name
- * @param session - Optional MongoDB session for transactions
- * @returns The updated user with new group memberships
- */
- async function syncUserEntraGroups(
- userId: string | Types.ObjectId,
- entraGroups: Array<{ id: string; name: string; description?: string; email?: string }>,
- session?: ClientSession,
- ): Promise<{
- user: IUser;
- addedGroups: IGroup[];
- removedGroups: IGroup[];
- }> {
- const User = mongoose.models.User as Model<IUser>;
- const Group = mongoose.models.Group as Model<IGroup>;
-
- const query = User.findById(userId, { idOnTheSource: 1 });
- if (session) {
- query.session(session);
- }
- const user = await query.lean<{ idOnTheSource?: string; _id: Types.ObjectId }>();
-
- if (!user) {
- throw new Error(`User not found: ${userId}`);
- }
-
- /** Get user's idOnTheSource for storing in group.memberIds */
- const userIdOnTheSource = user.idOnTheSource || userId.toString();
-
- const entraIdMap = new Map<string, boolean>();
- const addedGroups: IGroup[] = [];
- const removedGroups: IGroup[] = [];
-
- for (const entraGroup of entraGroups) {
- entraIdMap.set(entraGroup.id, true);
-
- let group = await findGroupByExternalId(entraGroup.id, 'entra', {}, session);
-
- if (!group) {
- group = await createGroup(
- {
- name: entraGroup.name,
- description: entraGroup.description,
- email: entraGroup.email,
- idOnTheSource: entraGroup.id,
- source: 'entra',
- memberIds: [userIdOnTheSource],
- },
- session,
- );
-
- addedGroups.push(group);
- } else if (!group.memberIds?.includes(userIdOnTheSource)) {
- const { group: updatedGroup } = await addUserToGroup(userId, group._id, session);
- if (updatedGroup) {
- addedGroups.push(updatedGroup);
- }
- }
- }
-
- const groupsQuery = Group.find(
- { source: 'entra', memberIds: userIdOnTheSource },
- { _id: 1, idOnTheSource: 1 },
- );
- if (session) {
- groupsQuery.session(session);
- }
- const existingGroups = await groupsQuery.lean<
- Array<{
- _id: Types.ObjectId;
- idOnTheSource?: string;
- }>
- >();
-
- for (const group of existingGroups) {
- if (group.idOnTheSource && !entraIdMap.has(group.idOnTheSource)) {
- const { group: removedGroup } = await removeUserFromGroup(userId, group._id, session);
- if (removedGroup) {
- removedGroups.push(removedGroup);
- }
- }
- }
-
- const userQuery = User.findById(userId);
- if (session) {
- userQuery.session(session);
- }
- const updatedUser = await userQuery.lean<IUser>();
-
- if (!updatedUser) {
- throw new Error(`User not found after update: ${userId}`);
- }
-
- return {
- user: updatedUser,
- addedGroups,
- removedGroups,
- };
- }
-
/**
* Calculate relevance score for a search result
* @param item - The search result item
@@ -1461,7 +1299,6 @@ export function createUserGroupMethods(
findGroupByExternalId,
findGroupsByExternalIds,
findGroupsByNamePattern,
- findGroupsByMemberId,
createGroup,
upsertGroupByExternalId,
addUserToGroup,
@@ -1471,9 +1308,7 @@ export function createUserGroupMethods(
updateGroupById,
updateGroupFieldsTracked,
bulkUpdateGroups,
- getUserGroups,
getUserPrincipals,
- syncUserEntraGroups,
searchPrincipals,
calculateRelevanceScore,
sortPrincipalsByRelevance,
diff --git a/packages/data-schemas/src/types/agentApiKey.ts b/packages/data-schemas/src/types/agentApiKey.ts
index c5e7836edd..7d8979f522 100644
--- a/packages/data-schemas/src/types/agentApiKey.ts
+++ b/packages/data-schemas/src/types/agentApiKey.ts
@@ -35,13 +35,3 @@ export interface AgentApiKeyListItem {
expiresAt?: Date;
createdAt: Date;
}
-
-export interface AgentApiKeyQuery {
- userId?: Types.ObjectId | string;
- keyPrefix?: string;
- id?: string;
-}
-
-export interface AgentApiKeyDeleteResult {
- deletedCount?: number;
-}
diff --git a/packages/data-schemas/src/types/pluginAuth.ts b/packages/data-schemas/src/types/pluginAuth.ts
index fb5c5fc4e7..136add7233 100644
--- a/packages/data-schemas/src/types/pluginAuth.ts
+++ b/packages/data-schemas/src/types/pluginAuth.ts
@@ -10,12 +10,6 @@ export interface IPluginAuth extends Document {
tenantId?: string;
}
-export interface PluginAuthQuery {
- userId: string;
- authField?: string;
- pluginKey?: string;
-}
-
export interface FindPluginAuthParams {
userId: string;
authField: string;
diff --git a/packages/data-schemas/src/types/role.ts b/packages/data-schemas/src/types/role.ts
index 9a5807013d..92120f4f87 100644
--- a/packages/data-schemas/src/types/role.ts
+++ b/packages/data-schemas/src/types/role.ts
@@ -1,7 +1,6 @@
import { PermissionTypes, Permissions } from 'librechat-data-provider';
import type { DeepPartial } from 'librechat-data-provider';
import type { Document } from 'mongoose';
-import { CursorPaginationParams } from '~/common';
export interface IRole extends Document {
name: string;
@@ -87,21 +86,3 @@ export interface IRole extends Document {
export type RolePermissions = IRole['permissions'];
export type RolePermissionsInput = DeepPartial<RolePermissions>;
-
-export interface CreateRoleRequest {
- name: string;
- description?: string;
- permissions: RolePermissionsInput;
-}
-
-export interface UpdateRoleRequest {
- name?: string;
- description?: string;
- permissions?: RolePermissionsInput;
-}
-
-export interface RoleFilterOptions extends CursorPaginationParams {
- // Includes role name
- search?: string;
- hasPermission?: string;
-}
diff --git a/packages/data-schemas/src/types/session.ts b/packages/data-schemas/src/types/session.ts
index f67ab947df..650509e2d3 100644
--- a/packages/data-schemas/src/types/session.ts
+++ b/packages/data-schemas/src/types/session.ts
@@ -18,11 +18,6 @@ export interface UpsertSessionOptions {
tenantId?: string;
}
-export interface UpdateExpirationOptions {
- /** Duration in milliseconds for session expiry. Default: 7 days */
- expiresIn?: number;
-}
-
export interface SessionSearchParams {
refreshToken?: string;
userId?: string;
diff --git a/packages/data-schemas/src/types/user.ts b/packages/data-schemas/src/types/user.ts
index 582b346fd8..e2b3cd861b 100644
--- a/packages/data-schemas/src/types/user.ts
+++ b/packages/data-schemas/src/types/user.ts
@@ -5,7 +5,6 @@ import type {
StatefulCodeEnvironment,
} from 'librechat-data-provider';
import type { Document, Types } from 'mongoose';
-import { CursorPaginationParams } from '~/common';
export interface IUser extends Document {
_id: Types.ObjectId;
@@ -157,52 +156,7 @@ export type CreateUserIfAbsentResult =
| { ok: true; value: UserRecord }
| { ok: false; error: { code: 'user_exists' } };
-export interface UpdateUserRequest {
- name?: string;
- username?: string;
- email?: string;
- role?: string;
- emailVerified?: boolean;
- avatar?: string;
- plugins?: string[];
- twoFactorEnabled?: boolean;
- termsAccepted?: boolean;
- termsAcceptedAt?: Date | null;
- personalization?: {
- memories?: boolean;
- statefulCodeEnvironment?: StatefulCodeEnvironment;
- };
- skillStates?: Record<string, boolean>;
-}
-
export interface UserDeleteResult {
deletedCount: number;
message: string;
}
-
-export interface UserFilterOptions extends CursorPaginationParams {
- _id?: Types.ObjectId | string;
- // Includes email, username and name
- search?: string;
- role?: string;
- emailVerified?: boolean;
- provider?: string;
- twoFactorEnabled?: boolean;
- // External IDs
- googleId?: string;
- facebookId?: string;
- openidId?: string;
- samlId?: string;
- ldapId?: string;
- githubId?: string;
- discordId?: string;
- appleId?: string;
- // Date filters
- createdAfter?: string;
- createdBefore?: string;
-}
-
-export interface UserQueryOptions {
- fieldsToSelect?: string | string[] | null;
- lean?: boolean;
-}
diff --git a/packages/data-schemas/src/utils/retry.ts b/packages/data-schemas/src/utils/retry.ts
index 7bf8c0284a..4815aaa11a 100644
--- a/packages/data-schemas/src/utils/retry.ts
+++ b/packages/data-schemas/src/utils/retry.ts
@@ -198,25 +198,3 @@ export async function createIndexesWithRetry(
options,
);
}
-
-/**
- * Initializes all collections and indexes for a set of models on a connection,
- * with per-model deadlock retry. Models are processed sequentially to minimize
- * contention on the DocumentDB catalog.
- */
-export async function initializeOrgCollections(
- models: Record<string, IndexedModel & { createCollection: () => Promise<unknown> }>,
- options: IndexBuildOptions = {},
-): Promise<{ totalMs: number; perModel: Array<{ name: string; ms: number }> }> {
- const perModel: Array<{ name: string; ms: number }> = [];
- const t0 = Date.now();
-
- for (const model of Object.values(models)) {
- const modelStart = Date.now();
- await model.createCollection();
- await createIndexesWithRetry(model, options);
- perModel.push({ name: model.modelName, ms: Date.now() - modelStart });
- }
-
- return { totalMs: Date.now() - t0, perModel };
-}