puter/paseo
1
0
Fork 0
mirror of https://github.com/getpaseo/paseo.git synced 2026-07-29 12:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(projects): preserve selected host identity

Browse Source
This commit is contained in:
Mohamed Boudra
2026-07-28 22:18:48 +00:00
parent 8f89aee756
commit d3d59749b0
4 changed files with 107 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/server/src/server/workspace-registry-bootstrap-legacy.ts
View File

@@ -33,7 +33,7 @@ export function classifyDirectoryForProjectMembership(input: {
const cwd = resolve(input.cwd);
const checkout: ProjectCheckoutLitePayload = { ...input.checkout, cwd };
const projectKey = deriveProjectGroupKey({
rootPath: checkout.worktreeRoot ?? cwd,
rootPath: cwd,
remoteUrl: checkout.remoteUrl,
worktreeRoot: checkout.worktreeRoot,
mainRepoRoot: checkout.mainRepoRoot,
@@ -54,7 +54,8 @@ export function classifyDirectoryForProjectMembership(input: {
function deriveWorkspaceDirectoryKey(cwd: string, checkout: ProjectCheckoutLitePayload): string {
const worktreeRoot = checkout.worktreeRoot ? parseGitRevParsePath(checkout.worktreeRoot) : null;
return worktreeRoot ?? resolve(cwd);
const selectedRoot = resolve(cwd);
return worktreeRoot && resolve(worktreeRoot) === selectedRoot ? worktreeRoot : selectedRoot;
}
function deriveProjectGroupingName(projectKey: string): string {

63
packages/server/src/server/workspace-registry-bootstrap.test.ts
View File

@@ -377,6 +377,69 @@ describe("bootstrapWorkspaceRegistries", () => {
]);
});
test("keeps legacy agents in different monorepo subprojects separate", async () => {
const appProject = path.join(GIT_PROJECT, "packages", "app");
const serverProject = path.join(GIT_PROJECT, "packages", "server");
mkdirSync(appProject, { recursive: true });
mkdirSync(serverProject, { recursive: true });
workspaceGitService = createNoopWorkspaceGitService({
getCheckout: async (cwd) => ({
cwd,
isGit: true,
currentBranch: "main",
remoteUrl: "git@github.com:acme/legacy-project.git",
worktreeRoot: GIT_PROJECT,
isPaseoOwnedWorktree: false,
mainRepoRoot: null,
}),
});
await agentStorage.initialize();
for (const [id, cwd] of [
["app-agent", appProject],
["server-agent", serverProject],
]) {
await agentStorage.upsert({
id,
provider: "codex",
cwd,
createdAt: "2026-03-01T00:00:00.000Z",
updatedAt: "2026-03-02T00:00:00.000Z",
lastActivityAt: "2026-03-02T00:00:00.000Z",
lastUserMessageAt: null,
title: null,
labels: {},
lastStatus: "idle",
lastModeId: null,
config: null,
runtimeInfo: { provider: "codex", sessionId: null },
persistence: null,
archivedAt: null,
});
}
await bootstrapWorkspaceRegistries({
paseoHome,
agentStorage,
projectRegistry,
workspaceRegistry,
workspaceGitService,
logger,
});
expect((await projectRegistry.list()).map((project) => project.projectId).sort()).toEqual([
"remote:github.com/acme/legacy-project#subdir:packages/app",
"remote:github.com/acme/legacy-project#subdir:packages/server",
]);
expect(
new Set((await workspaceRegistry.list()).map((workspace) => workspace.projectId)),
).toEqual(
new Set([
"remote:github.com/acme/legacy-project#subdir:packages/app",
"remote:github.com/acme/legacy-project#subdir:packages/server",
]),
);
});
test("migrates cwd-only agents to the oldest existing same-cwd workspace", async () => {
await projectRegistry.initialize();
await workspaceRegistry.initialize();