BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(server): own the requested project directory in the runtime

Browse Source 
Drop the canonical-containment 403 guard and the extra realpath(base) the
read routes (stat/read/raw/serve) had gained. Every workspace resolution
returns insideWorkspace: true and outside-file grants use
base = dirname(canonicalPath), so the guard could never fire; the flag had
no remaining reader and is gone with it. The read routes are back to the
single realpath(resolved.resolved) they had before.

Move the lexical-base fallback out of the inline header parsing in
routes.js. x-opencode-directory decoding belongs to
project-directory-runtime, so resolveProjectDirectory now also returns
requestedDirectory, the pre-realpath candidate that validated.
resolveWorkspacePathFromContext retries against it when the canonical base
rejects a path, which keeps files under a symlinked project root
addressable without a second copy of the header/query parsing.
This commit is contained in:
Bohdan Triapitsyn
2026-08-29 00:53:06 +03:00
parent 55ae41bde2
commit 3e0a9622aa
5 changed files with 88 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/web/server/lib/opencode/project-directory-runtime.js
+16 -11
View File
@@ -44,7 +44,12 @@ export const createProjectDirectoryRuntime = (dependencies) => {
return { ok: false, error: 'Specified path is not a directory' };
}
const realPath = await realpathCache.resolve(resolved);
return { ok: true, directory: realPath };
// `requestedDirectory` is the pre-realpath candidate the caller asked
// for. Callers that address files in the user-visible path space (the
// file tree, the read-family FS routes) need it when the project root
// is itself a symlink and the canonical `directory` no longer contains
// the paths the client sends.
return { ok: true, directory: realPath, requestedDirectory: resolved };
} catch (error) {
const err = error;
if (err && typeof err === 'object' && err.code === 'ENOENT') {
@@ -71,11 +76,11 @@ export const createProjectDirectoryRuntime = (dependencies) => {
for (const candidate of requested) {
const validated = await validateDirectoryPath(candidate);
if (validated.ok) {
return { directory: validated.directory, error: null };
return { directory: validated.directory, requestedDirectory: validated.requestedDirectory, error: null };
}
lastError = validated.error;
}
return { directory: null, error: lastError };
return { directory: null, requestedDirectory: null, error: lastError };
}
const readSettings = typeof getReadSettingsFromDiskMigrated === 'function'
@@ -93,27 +98,27 @@ export const createProjectDirectoryRuntime = (dependencies) => {
if (typeof settings.lastDirectory === 'string' && settings.lastDirectory.trim()) {
const validated = await validateDirectoryPath(settings.lastDirectory);
if (validated.ok) {
return { directory: validated.directory, error: null };
return { directory: validated.directory, requestedDirectory: validated.requestedDirectory, error: null };
}
}
const projects = sanitizeProjects(settings.projects) || [];
if (projects.length === 0) {
return { directory: null, error: 'Directory parameter or active project is required' };
return { directory: null, requestedDirectory: null, error: 'Directory parameter or active project is required' };
}
const activeId = typeof settings.activeProjectId === 'string' ? settings.activeProjectId : '';
const active = projects.find((project) => project.id === activeId) || projects[0];
if (!active || !active.path) {
return { directory: null, error: 'Directory parameter or active project is required' };
return { directory: null, requestedDirectory: null, error: 'Directory parameter or active project is required' };
}
const validated = await validateDirectoryPath(active.path);
if (!validated.ok) {
return { directory: null, error: validated.error };
return { directory: null, requestedDirectory: null, error: validated.error };
}
return { directory: validated.directory, error: null };
return { directory: validated.directory, requestedDirectory: validated.requestedDirectory, error: null };
};
const resolveOptionalProjectDirectory = async (req) => {
@@ -126,18 +131,18 @@ export const createProjectDirectoryRuntime = (dependencies) => {
const requested = [headerDirectory, queryDirectory].filter(Boolean);
if (requested.length === 0) {
return { directory: null, error: null };
return { directory: null, requestedDirectory: null, error: null };
}
let lastError = null;
for (const candidate of requested) {
const validated = await validateDirectoryPath(candidate);
if (validated.ok) {
return { directory: validated.directory, error: null };
return { directory: validated.directory, requestedDirectory: validated.requestedDirectory, error: null };
}
lastError = validated.error;
}
return { directory: null, error: lastError };
return { directory: null, requestedDirectory: null, error: lastError };
};
return {
packages/web/server/lib/opencode/project-directory-runtime.test.js
+32 -12
View File
@@ -26,7 +26,7 @@ describe('project directory runtime', () => {
const runtime = createTestRuntime();
const result = await runtime.validateDirectoryPath('/home/user/project');
expect(result).toEqual({ ok: true, directory: '/home/user/project' });
expect(result).toEqual({ ok: true, directory: '/home/user/project', requestedDirectory: '/home/user/project' });
});
it('resolves symlinks via fsPromises.realpath', async () => {
@@ -39,7 +39,7 @@ describe('project directory runtime', () => {
const result = await runtime.validateDirectoryPath('/symlink/path/to/project');
expect(result).toEqual({ ok: true, directory: '/real/path/to/project' });
expect(result).toEqual({ ok: true, directory: '/real/path/to/project', requestedDirectory: '/symlink/path/to/project' });
});
it('returns error when candidate is empty', async () => {
@@ -125,7 +125,11 @@ describe('project directory runtime', () => {
const result = await runtime.resolveProjectDirectory(req);
expect(result).toEqual({ directory: '/real/workspace/project', error: null });
expect(result).toEqual({
directory: '/real/workspace/project',
requestedDirectory: '/home/user/workspace/project',
error: null,
});
});
it('decodes marked x-opencode-directory header values', async () => {
@@ -153,7 +157,7 @@ describe('project directory runtime', () => {
const result = await runtime.resolveProjectDirectory(req);
expect(validatedPath).toBe(pathWithUnicode);
expect(result).toEqual({ directory: pathWithUnicode, error: null });
expect(result).toEqual({ directory: pathWithUnicode, requestedDirectory: pathWithUnicode, error: null });
});
it('preserves raw percent sequences without directory encoding marker', async () => {
@@ -177,7 +181,7 @@ describe('project directory runtime', () => {
const result = await runtime.resolveProjectDirectory(req);
expect(validatedPath).toBe(rawPath);
expect(result).toEqual({ directory: rawPath, error: null });
expect(result).toEqual({ directory: rawPath, requestedDirectory: rawPath, error: null });
});
it('falls back to query directory when an unmarked encoded header is invalid', async () => {
@@ -199,7 +203,7 @@ describe('project directory runtime', () => {
const result = await runtime.resolveProjectDirectory(req);
expect(result).toEqual({ directory: validPath, error: null });
expect(result).toEqual({ directory: validPath, requestedDirectory: validPath, error: null });
});
it('resolves symlinks in query directory parameter', async () => {
@@ -217,7 +221,11 @@ describe('project directory runtime', () => {
const result = await runtime.resolveProjectDirectory(req);
expect(result).toEqual({ directory: '/real/workspace/project', error: null });
expect(result).toEqual({
directory: '/real/workspace/project',
requestedDirectory: '/home/user/workspace/project',
error: null,
});
});
it('resolves symlinks in lastDirectory from settings', async () => {
@@ -238,7 +246,11 @@ describe('project directory runtime', () => {
const result = await runtime.resolveProjectDirectory(req);
expect(result).toEqual({ directory: '/real/workspace/project', error: null });
expect(result).toEqual({
directory: '/real/workspace/project',
requestedDirectory: '/home/user/workspace/project',
error: null,
});
});
it('resolves symlinks in active project path from settings', async () => {
@@ -261,7 +273,11 @@ describe('project directory runtime', () => {
const result = await runtime.resolveProjectDirectory(req);
expect(result).toEqual({ directory: '/real/workspace/project', error: null });
expect(result).toEqual({
directory: '/real/workspace/project',
requestedDirectory: '/home/user/workspace/project',
error: null,
});
});
});
@@ -276,7 +292,7 @@ describe('project directory runtime', () => {
const result = await runtime.resolveOptionalProjectDirectory(req);
expect(result).toEqual({ directory: null, error: null });
expect(result).toEqual({ directory: null, requestedDirectory: null, error: null });
});
it('resolves symlinks when directory is provided', async () => {
@@ -294,7 +310,11 @@ describe('project directory runtime', () => {
const result = await runtime.resolveOptionalProjectDirectory(req);
expect(result).toEqual({ directory: '/real/workspace/project', error: null });
expect(result).toEqual({
directory: '/real/workspace/project',
requestedDirectory: '/symlink/workspace/project',
error: null,
});
});
it('preserves raw percent sequences without directory encoding marker', async () => {
@@ -318,7 +338,7 @@ describe('project directory runtime', () => {
const result = await runtime.resolveOptionalProjectDirectory(req);
expect(validatedPath).toBe(rawPath);
expect(result).toEqual({ directory: rawPath, error: null });
expect(result).toEqual({ directory: rawPath, requestedDirectory: rawPath, error: null });
});
});
});