Skip to content

feat: add multi-project workspace support #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dataforxyz wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: add multi-project workspace support #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2da64ea
feat: add multi-project workspace support (#529)
dataforxyz Feb 20, 2026
2591586
fix: replace non-null assertions with optional chaining in tests
dataforxyz Feb 20, 2026
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
50 changes: 50 additions & 0 deletions packages/cli/src/lib/sandbox/__tests__/container-image-cache.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,56 @@ describe('computeSetupHash', () => {
);
expect(a).toBe(b);
});

it('changes when projects are added', () => {
const a = computeSetupHash(makeInputs());
const b = computeSetupHash(
makeInputs({
projects: [
{ name: 'api', path: 'packages/api', languages: ['python'] },
],
})
);
expect(a).not.toBe(b);
});

it('changes when project initScriptContent changes', () => {
const a = computeSetupHash(
makeInputs({
projects: [{ name: 'api', path: 'api', initScriptContent: '' }],
})
);
const b = computeSetupHash(
makeInputs({
projects: [
{ name: 'api', path: 'api', initScriptContent: 'npm install' },
],
})
);
expect(a).not.toBe(b);
});

it('is unaffected by project ordering', () => {
const projA = {
name: 'alpha',
path: 'alpha',
languages: ['typescript'] as string[],
};
const projB = {
name: 'beta',
path: 'beta',
languages: ['python'] as string[],
};
const a = computeSetupHash(makeInputs({ projects: [projA, projB] }));
const b = computeSetupHash(makeInputs({ projects: [projB, projA] }));
expect(a).toBe(b);
});

it('is stable without projects field', () => {
const a = computeSetupHash(makeInputs());
const b = computeSetupHash(makeInputs({ projects: undefined }));
expect(a).toBe(b);
});
});

describe('getCacheImageTag', () => {
Expand Down
54 changes: 50 additions & 4 deletions packages/cli/src/lib/sandbox/container-image-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ export interface SetupHashInputs {
envs?: string[];
headers?: string[];
}>;
projects?: Array<{
name: string;
path: string;
languages?: string[];
packageManagers?: string[];
taskManagers?: string[];
initScriptContent?: string;
}>;
}

/**
Expand All @@ -55,7 +63,7 @@ export interface SetupHashInputs {
* of the same values produces the same hash.
*/
export function computeSetupHash(inputs: SetupHashInputs): string {
const normalized = {
const normalized: Record<string, unknown> = {
agentImage: inputs.agentImage,
languages: [...inputs.languages].sort(),
packageManagers: [...inputs.packageManagers].sort(),
Expand All @@ -74,6 +82,19 @@ export function computeSetupHash(inputs: SetupHashInputs): string {
})),
};

if (inputs.projects && inputs.projects.length > 0) {
normalized.projects = [...inputs.projects]
.sort((a, b) => a.name.localeCompare(b.name))
.map(p => ({
name: p.name,
path: p.path,
languages: [...(p.languages || [])].sort(),
packageManagers: [...(p.packageManagers || [])].sort(),
taskManagers: [...(p.taskManagers || [])].sort(),
initScriptContent: p.initScriptContent || '',
}));
}

return createHash('sha256').update(JSON.stringify(normalized)).digest('hex');
}

Expand Down Expand Up @@ -175,15 +196,40 @@ export function checkImageCache(
}
}

// Read per-project init script contents for hashing
let projects: SetupHashInputs['projects'];
if (projectConfig.projects && projectConfig.projects.length > 0) {
projects = projectConfig.projects.map(p => {
let projectInitContent = '';
if (p.initScript) {
try {
const absPath = join(projectConfig.projectRoot, p.initScript);
projectInitContent = readFileSync(absPath, 'utf-8');
} catch {
// treat as empty
}
}
return {
name: p.name,
path: p.path,
languages: p.languages,
packageManagers: p.packageManagers,
taskManagers: p.taskManagers,
initScriptContent: projectInitContent,
};
});
}

const hash = computeSetupHash({
agentImage,
languages: projectConfig.languages,
packageManagers: projectConfig.packageManagers,
taskManagers: projectConfig.taskManagers,
languages: projectConfig.allLanguages,
packageManagers: projectConfig.allPackageManagers,
taskManagers: projectConfig.allTaskManagers,
agent,
roverVersion: getVersion(),
initScriptContent,
mcps: projectConfig.mcps,
projects,
});

const cacheTag = getCacheImageTag(hash);
Expand Down
51 changes: 43 additions & 8 deletions packages/cli/src/lib/sandbox/docker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,23 +203,35 @@ export class DockerSandbox extends Sandbox {
dockerArgs.push('-v', `${contextDir}:/context:Z,ro`);
}

// Mount initScript if provided in project config
if (projectConfig.initScript) {
const initScriptAbsPath = join(
projectConfig.projectRoot,
projectConfig.initScript
);
// Mount init scripts (root + per-project)
const allInitScripts = projectConfig.allInitScripts;
for (let i = 0; i < allInitScripts.length; i++) {
const entry = allInitScripts[i];
const initScriptAbsPath = join(projectConfig.projectRoot, entry.script);
if (existsSync(initScriptAbsPath)) {
dockerArgs.push('-v', `${initScriptAbsPath}:/init-script.sh:Z,ro`);
const mountPath =
allInitScripts.length === 1 && !entry.path
? '/init-script.sh'
: `/init-script-${i}.sh`;
dockerArgs.push('-v', `${initScriptAbsPath}:${mountPath}:Z,ro`);
} else if (!isJsonMode()) {
console.log(
colors.yellow(
`⚠ Warning: initScript '${projectConfig.initScript}' does not exist`
`⚠ Warning: initScript '${entry.script}' does not exist`
)
);
}
}

// Mount workspace description if projects are configured
const workspaceDescPath = setupBuilder.generateWorkspaceDescription();
if (workspaceDescPath) {
dockerArgs.push(
'-v',
`${workspaceDescPath}:/workspace/.rover-workspace.json:Z,ro`
);
}

// Get extra args from CLI options and project config, merge them
const configExtraArgs = normalizeExtraArgs(projectConfig.sandboxExtraArgs);
const cliExtraArgs = normalizeExtraArgs(this.options?.extraArgs);
Expand Down Expand Up @@ -496,6 +508,29 @@ export class DockerSandbox extends Sandbox {
dockerArgs.push('-v', `${contextDir}:/context:Z,ro`);
}

// Mount init scripts (root + per-project)
const allInitScripts = projectConfig.allInitScripts;
for (let i = 0; i < allInitScripts.length; i++) {
const entry = allInitScripts[i];
const initScriptAbsPath = join(projectConfig.projectRoot, entry.script);
if (existsSync(initScriptAbsPath)) {
const mountPath =
allInitScripts.length === 1 && !entry.path
? '/init-script.sh'
: `/init-script-${i}.sh`;
dockerArgs.push('-v', `${initScriptAbsPath}:${mountPath}:Z,ro`);
}
}

// Mount workspace description if projects are configured
const workspaceDescPath = setupBuilder.generateWorkspaceDescription();
if (workspaceDescPath) {
dockerArgs.push(
'-v',
`${workspaceDescPath}:/workspace/.rover-workspace.json:Z,ro`
);
}

// Get extra args from CLI options and project config, merge them
const configExtraArgs = normalizeExtraArgs(projectConfig.sandboxExtraArgs);
const cliExtraArgs = normalizeExtraArgs(this.options?.extraArgs);
Expand Down
51 changes: 43 additions & 8 deletions packages/cli/src/lib/sandbox/podman.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,23 +184,35 @@ export class PodmanSandbox extends Sandbox {
podmanArgs.push('-v', `${contextDir}:/context:Z,ro`);
}

// Mount initScript if provided in project config
if (projectConfig.initScript) {
const initScriptAbsPath = join(
projectConfig.projectRoot,
projectConfig.initScript
);
// Mount init scripts (root + per-project)
const allInitScripts = projectConfig.allInitScripts;
for (let i = 0; i < allInitScripts.length; i++) {
const entry = allInitScripts[i];
const initScriptAbsPath = join(projectConfig.projectRoot, entry.script);
if (existsSync(initScriptAbsPath)) {
podmanArgs.push('-v', `${initScriptAbsPath}:/init-script.sh:Z,ro`);
const mountPath =
allInitScripts.length === 1 && !entry.path
? '/init-script.sh'
: `/init-script-${i}.sh`;
podmanArgs.push('-v', `${initScriptAbsPath}:${mountPath}:Z,ro`);
} else if (!isJsonMode()) {
console.log(
colors.yellow(
`⚠ Warning: initScript '${projectConfig.initScript}' does not exist`
`⚠ Warning: initScript '${entry.script}' does not exist`
)
);
}
}

// Mount workspace description if projects are configured
const workspaceDescPath = setupBuilder.generateWorkspaceDescription();
if (workspaceDescPath) {
podmanArgs.push(
'-v',
`${workspaceDescPath}:/workspace/.rover-workspace.json:Z,ro`
);
}

// Get extra args from CLI options and project config, merge them
const configExtraArgs = normalizeExtraArgs(projectConfig.sandboxExtraArgs);
const cliExtraArgs = normalizeExtraArgs(this.options?.extraArgs);
Expand Down Expand Up @@ -463,6 +475,29 @@ export class PodmanSandbox extends Sandbox {
podmanArgs.push('-v', `${contextDir}:/context:Z,ro`);
}

// Mount init scripts (root + per-project)
const allInitScripts = projectConfig.allInitScripts;
for (let i = 0; i < allInitScripts.length; i++) {
const entry = allInitScripts[i];
const initScriptAbsPath = join(projectConfig.projectRoot, entry.script);
if (existsSync(initScriptAbsPath)) {
const mountPath =
allInitScripts.length === 1 && !entry.path
? '/init-script.sh'
: `/init-script-${i}.sh`;
podmanArgs.push('-v', `${initScriptAbsPath}:${mountPath}:Z,ro`);
}
}

// Mount workspace description if projects are configured
const workspaceDescPath = setupBuilder.generateWorkspaceDescription();
if (workspaceDescPath) {
podmanArgs.push(
'-v',
`${workspaceDescPath}:/workspace/.rover-workspace.json:Z,ro`
);
}

// Get extra args from CLI options and project config, merge them
const configExtraArgs = normalizeExtraArgs(projectConfig.sandboxExtraArgs);
const cliExtraArgs = normalizeExtraArgs(this.options?.extraArgs);
Expand Down
Loading