Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions api/server/services/Endpoints/agents/skillDeps.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ const {
readWorkspaceFile,
searchWorkspace,
listWorkspaceFiles,
writeWorkspaceFile,
previewWorkspaceEdit,
editWorkspaceFile,
readSandboxFile,
readSandboxImage,
writeSandboxFile,
Expand Down Expand Up @@ -386,6 +389,9 @@ const skillToolDeps = {
readWorkspaceFile,
searchWorkspace,
listWorkspaceFiles,
writeWorkspaceFile,
previewWorkspaceEdit,
editWorkspaceFile,
/**
* `read_file` falls back to a sandbox `cat` for `/mnt/data/...` paths
* and for `{firstSegment}/...` paths whose first segment isn't a known
Expand Down
15 changes: 15 additions & 0 deletions api/server/services/Endpoints/agents/skillDeps.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ const mockCreateDeploymentSkillMethods = jest.fn((methods) => methods);
const mockReadWorkspaceFile = jest.fn();
const mockSearchWorkspace = jest.fn();
const mockListWorkspaceFiles = jest.fn();
const mockWriteWorkspaceFile = jest.fn();
const mockPreviewWorkspaceEdit = jest.fn();
const mockEditWorkspaceFile = jest.fn();

jest.mock('~/server/services/Files/strategies', () => ({
getStrategyFunctions: (...args) => mockGetStrategyFunctions(...args),
Expand All @@ -24,6 +27,9 @@ jest.mock('~/server/services/Files/Code/process', () => ({
readWorkspaceFile: (...args) => mockReadWorkspaceFile(...args),
searchWorkspace: (...args) => mockSearchWorkspace(...args),
listWorkspaceFiles: (...args) => mockListWorkspaceFiles(...args),
writeWorkspaceFile: (...args) => mockWriteWorkspaceFile(...args),
previewWorkspaceEdit: (...args) => mockPreviewWorkspaceEdit(...args),
editWorkspaceFile: (...args) => mockEditWorkspaceFile(...args),
writeSandboxFile: jest.fn(),
}));

Expand Down Expand Up @@ -103,6 +109,15 @@ describe('skillDeps saveSkillFileContent', () => {
expect(mockListWorkspaceFiles).toHaveBeenCalledWith({ path: 'src' });
});

it('exposes attached-workspace mutations to agent handlers', () => {
getSkillToolDeps().writeWorkspaceFile({ path: 'src/new.ts' });
getSkillToolDeps().previewWorkspaceEdit({ path: 'src/app.ts' });
getSkillToolDeps().editWorkspaceFile({ path: 'src/app.ts' });
expect(mockWriteWorkspaceFile).toHaveBeenCalledWith({ path: 'src/new.ts' });
expect(mockPreviewWorkspaceEdit).toHaveBeenCalledWith({ path: 'src/app.ts' });
expect(mockEditWorkspaceFile).toHaveBeenCalledWith({ path: 'src/app.ts' });
});

it('cleans up the uploaded object when metadata upsert returns no row', async () => {
mockDb.upsertSkillFile.mockResolvedValue(null);

Expand Down
94 changes: 94 additions & 0 deletions api/server/services/Files/Code/process.js
Original file line number Diff line number Diff line change
Expand Up @@ -1798,6 +1798,97 @@ async function listWorkspaceFiles({
});
}

/** Writes a UTF-8 file in the workspace registered by an attached worker. */
async function writeWorkspaceFile({
file_path,
content,
overwrite,
workspace_id,
codeApiBaseUrl,
executionProfile,
bridgeWorkerId,
req,
signal,
}) {
const authHeaders = await getCodeApiAuthHeaders(req, bridgeWorkerId);
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
authHeaders: {
...authHeaders,
...codeExecutionHeaders({ executionProfile, bridgeWorkerId }),
},
request: {
protocolVersion: 1,
operation: 'write_file',
workspaceId: workspace_id,
path: file_path,
content,
overwrite,
},
...(signal ? { signal } : {}),
});
}

/** Applies an ordered exact-edit batch in one attached-worker mutation. */
async function editWorkspaceFile({
file_path,
edits,
expected_base_sha256,
workspace_id,
codeApiBaseUrl,
executionProfile,
bridgeWorkerId,
req,
signal,
}) {
const authHeaders = await getCodeApiAuthHeaders(req, bridgeWorkerId);
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
authHeaders: {
...authHeaders,
...codeExecutionHeaders({ executionProfile, bridgeWorkerId }),
},
request: {
protocolVersion: 1,
operation: 'edit_file',
workspaceId: workspace_id,
path: file_path,
edits,
...(expected_base_sha256 ? { expectedBaseSha256: expected_base_sha256 } : {}),
},
...(signal ? { signal } : {}),
});
}

/** Previews an ordered exact-edit batch without mutating the attached workspace. */
async function previewWorkspaceEdit({
file_path,
edits,
workspace_id,
codeApiBaseUrl,
executionProfile,
bridgeWorkerId,
req,
signal,
}) {
const authHeaders = await getCodeApiAuthHeaders(req, bridgeWorkerId);
return executeWorkspaceTool({
baseURL: codeApiBaseUrl,
authHeaders: {
...authHeaders,
...codeExecutionHeaders({ executionProfile, bridgeWorkerId }),
},
request: {
protocolVersion: 1,
operation: 'preview_edit',
workspaceId: workspace_id,
path: file_path,
edits,
},
...(signal ? { signal } : {}),
});
}

/**
* Reads a small code artifact as base64 so `read_file` can surface it to
* vision-capable models. Reuses bytes fetched by the current request's
Expand Down Expand Up @@ -2067,6 +2158,9 @@ module.exports = {
readWorkspaceFile,
searchWorkspace,
listWorkspaceFiles,
writeWorkspaceFile,
previewWorkspaceEdit,
editWorkspaceFile,
readSandboxFile,
readSandboxImage,
writeSandboxFile,
Expand Down
134 changes: 134 additions & 0 deletions api/server/services/Files/Code/process.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ const {
readWorkspaceFile,
searchWorkspace,
listWorkspaceFiles,
writeWorkspaceFile,
previewWorkspaceEdit,
editWorkspaceFile,
readSandboxImage,
writeSandboxFile,
primeFiles,
Expand Down Expand Up @@ -1988,6 +1991,137 @@ describe('Code Process', () => {
});
});

describe('workspace mutations', () => {
it('forwards create-only writes to the selected attached worker', async () => {
const controller = new AbortController();
const result = {
protocolVersion: 1,
operation: 'write_file',
workspaceId: 'primary',
path: 'src/new.ts',
created: true,
bytesWritten: 5,
};
getCodeApiAuthHeaders.mockResolvedValueOnce({ Authorization: 'Bearer workspace-token' });
mockExecuteWorkspaceTool.mockResolvedValueOnce(result);

await expect(
writeWorkspaceFile({
file_path: 'src/new.ts',
content: 'ready',
overwrite: false,
workspace_id: 'primary',
codeApiBaseUrl: 'https://attached-code.example.com/v1',
executionProfile: 'stateful',
bridgeWorkerId: 'worker-user-1',
req: mockReq,
signal: controller.signal,
}),
).resolves.toBe(result);

expect(mockExecuteWorkspaceTool).toHaveBeenCalledWith({
baseURL: 'https://attached-code.example.com/v1',
authHeaders: {
Authorization: 'Bearer workspace-token',
'X-CodeAPI-Expected-Profile': 'stateful',
'X-LibreChat-Code-Worker-ID': 'worker-user-1',
},
request: {
protocolVersion: 1,
operation: 'write_file',
workspaceId: 'primary',
path: 'src/new.ts',
content: 'ready',
overwrite: false,
},
signal: controller.signal,
});
});

it('forwards an edit batch as one attached-worker request', async () => {
const result = {
protocolVersion: 1,
operation: 'edit_file',
workspaceId: 'primary',
path: 'src/app.ts',
replacements: 2,
bytesWritten: 20,
};
getCodeApiAuthHeaders.mockResolvedValueOnce({ Authorization: 'Bearer workspace-token' });
mockExecuteWorkspaceTool.mockResolvedValueOnce(result);

await expect(
editWorkspaceFile({
file_path: 'src/app.ts',
edits: [
{ oldText: 'draft', newText: 'ready' },
{ oldText: 'false', newText: 'true' },
],
workspace_id: 'primary',
codeApiBaseUrl: 'https://attached-code.example.com/v1',
executionProfile: 'stateful',
bridgeWorkerId: 'worker-user-1',
req: mockReq,
expected_base_sha256: 'a'.repeat(64),
}),
).resolves.toBe(result);

expect(mockExecuteWorkspaceTool).toHaveBeenCalledWith(
expect.objectContaining({
request: {
protocolVersion: 1,
operation: 'edit_file',
workspaceId: 'primary',
path: 'src/app.ts',
edits: [
{ oldText: 'draft', newText: 'ready' },
{ oldText: 'false', newText: 'true' },
],
expectedBaseSha256: 'a'.repeat(64),
},
}),
);
});

it('forwards a non-mutating attached-workspace edit preview', async () => {
const result = {
protocolVersion: 1,
operation: 'preview_edit',
workspaceId: 'primary',
path: 'src/app.ts',
content: 'prefix SECRET',
hasUtf8Bom: false,
baseSha256: 'b'.repeat(64),
replacements: 1,
bytesWritten: 13,
};
mockExecuteWorkspaceTool.mockResolvedValueOnce(result);

await expect(
previewWorkspaceEdit({
file_path: 'src/app.ts',
edits: [{ oldText: ' SEC', newText: ' SECRET' }],
workspace_id: 'primary',
codeApiBaseUrl: 'https://attached-code.example.com/v1',
executionProfile: 'stateful',
req: mockReq,
}),
).resolves.toBe(result);

expect(mockExecuteWorkspaceTool).toHaveBeenCalledWith(
expect.objectContaining({
request: {
protocolVersion: 1,
operation: 'preview_edit',
workspaceId: 'primary',
path: 'src/app.ts',
edits: [{ oldText: ' SEC', newText: ' SECRET' }],
},
}),
);
});
});

describe('readSandboxFile', () => {
/**
* `readSandboxFile` shells `cat <file_path>` through the sandbox
Expand Down
Loading
Loading