🥧 fix: Reserve Execution Time in Workspace Admission (#16421)

* 🥧 fix: Reserve Execution Time in Workspace Admission

* 🥧 fix: Pass Workspace Admission Static Checks

---------

Co-authored-by: Lia <lia@librechat.ai>
This commit is contained in:
lia-by-librechat[bot] 2026-09-27 20:19:54 -04:00 • committed by GitHub
parent 8ec632ff0e
commit bf91d2b59c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 656 additions and 47 deletions

View file

@ -1088,10 +1088,14 @@ async function readWorkspaceFile({
req,
signal,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
}) {
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
/** Minted per admission attempt: a queued call outlives one token TTL. */
authHeaders: async () => ({
...(await getCodeApiAuthHeaders(req, bridgeWorkerId)),
@ -1137,10 +1141,14 @@ async function searchWorkspace({
req,
signal,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
}) {
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
/** Minted per admission attempt: a queued call outlives one token TTL. */
authHeaders: async () => ({
...(await getCodeApiAuthHeaders(req, bridgeWorkerId)),
@ -1186,10 +1194,14 @@ async function listWorkspaceFiles({
req,
signal,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
}) {
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
/** Minted per admission attempt: a queued call outlives one token TTL. */
authHeaders: async () => ({
...(await getCodeApiAuthHeaders(req, bridgeWorkerId)),
@ -1221,10 +1233,14 @@ async function writeWorkspaceFile({
req,
signal,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
}) {
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
/** Minted per admission attempt: a queued call outlives one token TTL. */
authHeaders: async () => ({
...(await getCodeApiAuthHeaders(req, bridgeWorkerId)),
@ -1256,10 +1272,14 @@ async function editWorkspaceFile({
req,
signal,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
}) {
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
/** Minted per admission attempt: a queued call outlives one token TTL. */
authHeaders: async () => ({
...(await getCodeApiAuthHeaders(req, bridgeWorkerId)),
@ -1290,10 +1310,14 @@ async function previewWorkspaceEdit({
req,
signal,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
}) {
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
maxQueueWaitMs,
maxRequestTimeoutMs,
deadlineAtMs,
/** Minted per admission attempt: a queued call outlives one token TTL. */
authHeaders: async () => ({
...(await getCodeApiAuthHeaders(req, bridgeWorkerId)),

View file

@ -2061,6 +2061,8 @@ describe('Code Process', () => {
req: mockReq,
signal: controller.signal,
maxQueueWaitMs: 0,
maxRequestTimeoutMs: 125_000,
deadlineAtMs: 160_000,
}),
).resolves.toBe(result);
@ -2081,6 +2083,8 @@ describe('Code Process', () => {
baseURL: 'https://attached-code.example.com/v1',
authHeaders: expect.any(Function),
maxQueueWaitMs: 0,
maxRequestTimeoutMs: 125_000,
deadlineAtMs: 160_000,
request: {
protocolVersion: 1,
operation: 'read_file',
@ -2140,6 +2144,8 @@ describe('Code Process', () => {
baseURL: 'https://attached-code.example.com/v1',
authHeaders: expect.any(Function),
maxQueueWaitMs: 0,
maxRequestTimeoutMs: undefined,
deadlineAtMs: undefined,
request: {
protocolVersion: 1,
operation: 'search_text',
@ -2198,6 +2204,8 @@ describe('Code Process', () => {
baseURL: 'https://attached-code.example.com/v1',
authHeaders: expect.any(Function),
maxQueueWaitMs: 0,
maxRequestTimeoutMs: undefined,
deadlineAtMs: undefined,
request: {
protocolVersion: 1,
operation: 'list_files',
@ -2258,6 +2266,8 @@ describe('Code Process', () => {
baseURL: 'https://attached-code.example.com/v1',
authHeaders: expect.any(Function),
maxQueueWaitMs: 0,
maxRequestTimeoutMs: undefined,
deadlineAtMs: undefined,
request: {
protocolVersion: 1,
operation: 'write_file',
@ -2296,11 +2306,15 @@ describe('Code Process', () => {
bridgeWorkerId: 'worker-user-1',
req: mockReq,
expected_base_sha256: 'a'.repeat(64),
maxRequestTimeoutMs: 125_000,
deadlineAtMs: 160_000,
}),
).resolves.toBe(result);
expect(mockExecuteWorkspaceTool).toHaveBeenCalledWith(
expect.objectContaining({
maxRequestTimeoutMs: 125_000,
deadlineAtMs: 160_000,
request: {
protocolVersion: 1,
operation: 'edit_file',
@ -2338,11 +2352,15 @@ describe('Code Process', () => {
codeApiBaseUrl: 'https://attached-code.example.com/v1',
executionProfile: 'stateful',
req: mockReq,
maxRequestTimeoutMs: 125_000,
deadlineAtMs: 160_000,
}),
).resolves.toBe(result);
expect(mockExecuteWorkspaceTool).toHaveBeenCalledWith(
expect.objectContaining({
maxRequestTimeoutMs: 125_000,
deadlineAtMs: 160_000,
request: {
protocolVersion: 1,
operation: 'preview_edit',

View file

@ -53,6 +53,7 @@ const {
createRepositoryInstructionLoader,
resolveAttachedWorkspaceCommandTimeoutMax,
resolveAttachedWorkspaceQueueWaitMs,
resolveAttachedWorkspaceRequestTimeoutMs,
createContextProgrammaticBashTool,
resolveCodeExecutionContext,
resolveCodeExecutionWorkspaceContext,
@ -2308,6 +2309,9 @@ async function loadToolsForExecution({
maxQueueWaitMs: resolveAttachedWorkspaceQueueWaitMs(
codeExecutionContext.codeEnvironmentConfigSchema,
),
maxRequestTimeoutMs: resolveAttachedWorkspaceRequestTimeoutMs(
codeExecutionContext.codeEnvironmentConfigSchema,
),
})
: createBashExecutionTool({
authHeaders,