@getpaseo/server 0.1.62 → 0.1.63

package/dist/server/server/workspace-reconciliation-service.js

@@ -59,102 +59,102 @@ export class WorkspaceReconciliationService {
             workspacesByProject.set(workspace.projectId, list);
         }
         // 1. Archive workspaces whose directories no longer exist
-        for (const workspace of activeWorkspaces) {
-            if (!existsSync(workspace.cwd)) {
-                const timestamp = new Date().toISOString();
-                await this.workspaceRegistry.archive(workspace.workspaceId, timestamp);
-                changes.push({
-                    kind: "workspace_archived",
-                    workspaceId: workspace.workspaceId,
-                    directory: workspace.cwd,
-                    reason: "directory_missing",
-                });
-                // Update the in-memory list for the project orphan check below
-                const siblings = workspacesByProject.get(workspace.projectId);
-                if (siblings) {
-                    const updated = siblings.filter((w) => w.workspaceId !== workspace.workspaceId);
-                    workspacesByProject.set(workspace.projectId, updated);
-                }
+        const missingWorkspaces = activeWorkspaces.filter((workspace) => !existsSync(workspace.cwd));
+        await Promise.all(missingWorkspaces.map(async (workspace) => {
+            const timestamp = new Date().toISOString();
+            await this.workspaceRegistry.archive(workspace.workspaceId, timestamp);
+            changes.push({
+                kind: "workspace_archived",
+                workspaceId: workspace.workspaceId,
+                directory: workspace.cwd,
+                reason: "directory_missing",
+            });
+            // Update the in-memory list for the project orphan check below
+            const siblings = workspacesByProject.get(workspace.projectId);
+            if (siblings) {
+                const updated = siblings.filter((w) => w.workspaceId !== workspace.workspaceId);
+                workspacesByProject.set(workspace.projectId, updated);
             }
-        }
+        }));
         // 2. Archive orphaned projects (all workspaces archived/removed)
-        for (const project of activeProjects) {
+        const orphanedProjects = activeProjects.filter((project) => {
             const siblings = workspacesByProject.get(project.projectId) ?? [];
-            if (siblings.length === 0) {
-                const timestamp = new Date().toISOString();
-                await this.projectRegistry.archive(project.projectId, timestamp);
-                changes.push({
-                    kind: "project_archived",
-                    projectId: project.projectId,
-                    directory: project.rootPath,
-                    reason: "no_active_workspaces",
-                });
-            }
-        }
+            return siblings.length === 0;
+        });
+        await Promise.all(orphanedProjects.map(async (project) => {
+            const timestamp = new Date().toISOString();
+            await this.projectRegistry.archive(project.projectId, timestamp);
+            changes.push({
+                kind: "project_archived",
+                projectId: project.projectId,
+                directory: project.rootPath,
+                reason: "no_active_workspaces",
+            });
+        }));
         // 3. Reconcile git metadata for active projects whose directories still exist
-        for (const project of activeProjects) {
+        const projectsToReconcile = activeProjects.filter((project) => {
             if (project.archivedAt)
-                continue;
+                return false;
             const siblings = workspacesByProject.get(project.projectId) ?? [];
             if (siblings.length === 0)
-                continue;
+                return false;
             if (!existsSync(project.rootPath))
-                continue;
-            const directoryName = project.rootPath.split(/[\\/]/).filter(Boolean).at(-1) ?? project.rootPath;
-            const currentGit = await this.readWorkspaceGitMetadata(project.rootPath, directoryName);
-            const projectUpdates = {};
-            const mappedKind = currentGit.projectKind === "git" ? "git" : "non_git";
-            // Detect kind change: directory → git
-            if (project.kind !== mappedKind) {
-                projectUpdates.kind = mappedKind;
-                projectUpdates.displayName = currentGit.projectDisplayName;
-            }
-            // Detect display name change (e.g. remote renamed)
-            if (project.kind === "git" &&
-                currentGit.projectKind === "git" &&
-                project.displayName !== currentGit.projectDisplayName) {
-                projectUpdates.displayName = currentGit.projectDisplayName;
-            }
-            if (Object.keys(projectUpdates).length > 0) {
+                return false;
+            return true;
+        });
+        await Promise.all(projectsToReconcile.map((project) => this.reconcileProject(project, workspacesByProject.get(project.projectId) ?? [], changes)));
+        if (changes.length > 0 && this.onChanges) {
+            this.onChanges(changes);
+        }
+        return { changesApplied: changes, durationMs: Date.now() - start };
+    }
+    async reconcileProject(project, siblings, changes) {
+        const directoryName = project.rootPath.split(/[\\/]/).findLast(Boolean) ?? project.rootPath;
+        const currentGit = await this.readWorkspaceGitMetadata(project.rootPath, directoryName);
+        const projectUpdates = {};
+        const mappedKind = currentGit.projectKind === "git" ? "git" : "non_git";
+        if (project.kind !== mappedKind) {
+            projectUpdates.kind = mappedKind;
+            projectUpdates.displayName = currentGit.projectDisplayName;
+        }
+        if (project.kind === "git" &&
+            currentGit.projectKind === "git" &&
+            project.displayName !== currentGit.projectDisplayName) {
+            projectUpdates.displayName = currentGit.projectDisplayName;
+        }
+        if (Object.keys(projectUpdates).length > 0) {
+            const timestamp = new Date().toISOString();
+            await this.projectRegistry.upsert({
+                ...project,
+                ...projectUpdates,
+                updatedAt: timestamp,
+            });
+            changes.push({
+                kind: "project_updated",
+                projectId: project.projectId,
+                directory: project.rootPath,
+                fields: projectUpdates,
+            });
+        }
+        const existingSiblings = siblings.filter((workspace) => existsSync(workspace.cwd));
+        await Promise.all(existingSiblings.map(async (workspace) => {
+            const wsDirName = workspace.cwd.split(/[\\/]/).findLast(Boolean) ?? workspace.cwd;
+            const wsGit = await this.readWorkspaceGitMetadata(workspace.cwd, wsDirName);
+            if (wsGit.projectKind === "git" && workspace.displayName !== wsGit.workspaceDisplayName) {
                 const timestamp = new Date().toISOString();
-                await this.projectRegistry.upsert({
-                    ...project,
-                    ...projectUpdates,
+                await this.workspaceRegistry.upsert({
+                    ...workspace,
+                    displayName: wsGit.workspaceDisplayName,
                     updatedAt: timestamp,
                 });
                 changes.push({
-                    kind: "project_updated",
-                    projectId: project.projectId,
-                    directory: project.rootPath,
-                    fields: projectUpdates,
+                    kind: "workspace_updated",
+                    workspaceId: workspace.workspaceId,
+                    directory: workspace.cwd,
+                    fields: { displayName: wsGit.workspaceDisplayName },
                 });
             }
-            // 4. Reconcile workspace display names (branch name changes)
-            for (const workspace of siblings) {
-                if (!existsSync(workspace.cwd))
-                    continue;
-                const wsDirName = workspace.cwd.split(/[\\/]/).filter(Boolean).at(-1) ?? workspace.cwd;
-                const wsGit = await this.readWorkspaceGitMetadata(workspace.cwd, wsDirName);
-                if (wsGit.projectKind === "git" && workspace.displayName !== wsGit.workspaceDisplayName) {
-                    const timestamp = new Date().toISOString();
-                    await this.workspaceRegistry.upsert({
-                        ...workspace,
-                        displayName: wsGit.workspaceDisplayName,
-                        updatedAt: timestamp,
-                    });
-                    changes.push({
-                        kind: "workspace_updated",
-                        workspaceId: workspace.workspaceId,
-                        directory: workspace.cwd,
-                        fields: { displayName: wsGit.workspaceDisplayName },
-                    });
-                }
-            }
-        }
-        if (changes.length > 0 && this.onChanges) {
-            this.onChanges(changes);
-        }
-        return { changesApplied: changes, durationMs: Date.now() - start };
+        }));
     }
     async readWorkspaceGitMetadata(cwd, directoryName) {
         if (!this.workspaceGitService) {

package/dist/server/server/workspace-reconciliation-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-reconciliation-service.js","sourceRoot":"","sources":["../../../src/server/workspace-reconciliation-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-reconciliation-service.js","sourceRoot":"","sources":["../../../src/server/workspace-reconciliation-service.ts"],"names":[],"mappings":"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"}

package/dist/server/server/workspace-registry-bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-registry-bootstrap.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-registry-bootstrap.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAU7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACvB,MAAM,yBAAyB,CAAC;AA8BjC,wBAAsB,4BAA4B,CAAC,OAAO,EAAE;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8FhB"}
+{"version":3,"file":"workspace-registry-bootstrap.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-registry-bootstrap.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAK7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACvB,MAAM,yBAAyB,CAAC;AA8BjC,wBAAsB,4BAA4B,CAAC,OAAO,EAAE;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkHhB"}

package/dist/server/server/workspace-registry-bootstrap.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { buildProjectPlacementForCwd, deriveWorkspaceId, deriveProjectKind, deriveProjectRootPath, deriveWorkspaceDisplayName, deriveWorkspaceKind, normalizeWorkspaceId, } from "./workspace-registry-model.js";
+import { classifyDirectoryForProjectMembership, normalizeWorkspaceId, } from "./workspace-registry-model.js";
 import { createPersistedProjectRecord, createPersistedWorkspaceRecord, } from "./workspace-registry.js";
 function minIsoDate(left, right) {
     if (!left) {
@@ -37,21 +37,25 @@ export async function bootstrapWorkspaceRegistries(options) {
     const records = await options.agentStorage.list();
     const activeRecords = records.filter((record) => !record.archivedAt);
     const recordsByWorkspaceId = new Map();
-    for (const record of activeRecords) {
+    const placements = await Promise.all(activeRecords.map(async (record) => {
         const normalizedCwd = normalizeWorkspaceId(record.cwd);
-        const placement = await buildProjectPlacementForCwd({
+        const checkout = await options.workspaceGitService.getCheckout(normalizedCwd);
+        const membership = classifyDirectoryForProjectMembership({
             cwd: normalizedCwd,
-            workspaceGitService: options.workspaceGitService,
+            checkout,
         });
-        const workspaceId = deriveWorkspaceId(normalizedCwd, placement.checkout);
-        const existing = recordsByWorkspaceId.get(workspaceId) ?? { placement, records: [] };
+        return { record, membership, workspaceId: membership.workspaceId };
+    }));
+    for (const { record, membership, workspaceId } of placements) {
+        const existing = recordsByWorkspaceId.get(workspaceId) ?? { membership, records: [] };
         existing.records.push(record);
         recordsByWorkspaceId.set(workspaceId, existing);
     }
     const projectRanges = new Map();
+    const workspaceUpsertInputs = [];
     for (const [workspaceId, entry] of recordsByWorkspaceId.entries()) {
-        const { placement, records: workspaceRecords } = entry;
-        const workspaceCwd = placement.checkout.cwd;
+        const { membership, records: workspaceRecords } = entry;
+        const workspaceCwd = membership.checkout.cwd;
         let workspaceCreatedAt = null;
         let workspaceUpdatedAt = null;
         for (const record of workspaceRecords) {
@@ -60,37 +64,40 @@ export async function bootstrapWorkspaceRegistries(options) {
         }
         const createdAt = workspaceCreatedAt ?? new Date().toISOString();
         const updatedAt = workspaceUpdatedAt ?? createdAt;
-        await options.workspaceRegistry.upsert(createPersistedWorkspaceRecord({
-            workspaceId,
-            projectId: placement.projectKey,
-            cwd: workspaceCwd,
-            kind: deriveWorkspaceKind(placement.checkout),
-            displayName: deriveWorkspaceDisplayName({
-                cwd: workspaceCwd,
-                checkout: placement.checkout,
-            }),
-            createdAt,
-            updatedAt,
-        }));
-        const existingProjectRange = projectRanges.get(placement.projectKey) ?? {
+        const existingProjectRange = projectRanges.get(membership.projectKey) ?? {
             createdAt: null,
             updatedAt: null,
         };
         existingProjectRange.createdAt = minIsoDate(existingProjectRange.createdAt, createdAt);
         existingProjectRange.updatedAt = maxIsoDate(existingProjectRange.updatedAt, updatedAt);
-        projectRanges.set(placement.projectKey, existingProjectRange);
-        await options.projectRegistry.upsert(createPersistedProjectRecord({
-            projectId: placement.projectKey,
-            rootPath: deriveProjectRootPath({
-                cwd: workspaceCwd,
-                checkout: placement.checkout,
-            }),
-            kind: deriveProjectKind(placement.checkout),
-            displayName: placement.projectName,
-            createdAt: existingProjectRange.createdAt ?? createdAt,
-            updatedAt: existingProjectRange.updatedAt ?? updatedAt,
-        }));
+        projectRanges.set(membership.projectKey, existingProjectRange);
+        workspaceUpsertInputs.push({ workspaceId, membership, workspaceCwd, createdAt, updatedAt });
     }
+    await Promise.all(workspaceUpsertInputs.flatMap(({ workspaceId, membership, workspaceCwd, createdAt, updatedAt }) => {
+        const projectRange = projectRanges.get(membership.projectKey) ?? {
+            createdAt: null,
+            updatedAt: null,
+        };
+        return [
+            options.workspaceRegistry.upsert(createPersistedWorkspaceRecord({
+                workspaceId,
+                projectId: membership.projectKey,
+                cwd: workspaceCwd,
+                kind: membership.workspaceKind,
+                displayName: membership.workspaceDisplayName,
+                createdAt,
+                updatedAt,
+            })),
+            options.projectRegistry.upsert(createPersistedProjectRecord({
+                projectId: membership.projectKey,
+                rootPath: membership.projectRootPath,
+                kind: membership.projectKind,
+                displayName: membership.projectName,
+                createdAt: projectRange.createdAt ?? createdAt,
+                updatedAt: projectRange.updatedAt ?? updatedAt,
+            })),
+        ];
+    }));
     options.logger.info({
         projectsFile: path.join(options.paseoHome, "projects", "projects.json"),
         workspacesFile: path.join(options.paseoHome, "projects", "workspaces.json"),

package/dist/server/server/workspace-registry-bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-registry-bootstrap.js","sourceRoot":"","sources":["../../../src/server/workspace-registry-bootstrap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-registry-bootstrap.js","sourceRoot":"","sources":["../../../src/server/workspace-registry-bootstrap.ts"],"names":[],"mappings":"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"}

package/dist/server/server/workspace-registry-model.d.ts

@@ -1,18 +1,27 @@
 import type { ProjectCheckoutLitePayload, ProjectPlacementPayload } from "../shared/messages.js";
-import type { WorkspaceGitService } from "./workspace-git-service.js";
 import type { PersistedWorkspaceRecord } from "./workspace-registry.js";
 export type PersistedProjectKind = "git" | "non_git";
 export type PersistedWorkspaceKind = "local_checkout" | "worktree" | "directory";
-export type DetectStaleWorkspacesInput = {
+export interface DirectoryProjectMembership {
+    cwd: string;
+    checkout: ProjectCheckoutLitePayload;
+    workspaceId: string;
+    workspaceKind: PersistedWorkspaceKind;
+    workspaceDisplayName: string;
+    projectKey: string;
+    projectName: string;
+    projectRootPath: string;
+    projectKind: PersistedProjectKind;
+}
+export interface DetectStaleWorkspacesInput {
     activeWorkspaces: PersistedWorkspaceRecord[];
     checkDirectoryExists: (cwd: string) => Promise<boolean>;
-};
+}
 export declare function normalizeWorkspaceId(cwd: string): string;
 export declare function deriveWorkspaceId(cwd: string, checkout: ProjectCheckoutLitePayload): string;
 export declare function deriveProjectGroupingKey(options: {
     cwd: string;
     remoteUrl: string | null;
-    isPaseoOwnedWorktree: boolean;
     mainRepoRoot: string | null;
 }): string;
 export declare function deriveProjectGroupingName(projectKey: string): string;
@@ -37,6 +46,10 @@ export declare function checkoutLiteFromGitSnapshot(cwd: string, git: {
 export declare function detectStaleWorkspaces(input: DetectStaleWorkspacesInput): Promise<Set<string>>;
 export declare function buildProjectPlacementForCwd(input: {
     cwd: string;
-    workspaceGitService: WorkspaceGitService;
-}): Promise<ProjectPlacementPayload>;
+    checkout: ProjectCheckoutLitePayload;
+}): ProjectPlacementPayload;
+export declare function classifyDirectoryForProjectMembership(input: {
+    cwd: string;
+    checkout: ProjectCheckoutLitePayload;
+}): DirectoryProjectMembership;
 //# sourceMappingURL=workspace-registry-model.d.ts.map

package/dist/server/server/workspace-registry-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-registry-model.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-registry-model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEjG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAExE,MAAM,MAAM,oBAAoB,GAAG,KAAK,GAAG,SAAS,CAAC;AACrD,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG,UAAU,GAAG,WAAW,CAAC;AACjF,MAAM,MAAM,0BAA0B,GAAG;IACvC,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;IAC7C,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACzD,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B,GAAG,MAAM,CAG3F;AAiDD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GAAG,MAAM,CAYT;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAQpE;AAQD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,MAAM,CAMT;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,MAAM,CAKT;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,oBAAoB,CAE5F;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,sBAAsB,CAKhG;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE;IACH,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GACA,0BAA0B,CAgC5B;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAWtB;AAED,wBAAsB,2BAA2B,CAAC,KAAK,EAAE;IACvD,GAAG,EAAE,MAAM,CAAC;IACZ,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgCnC"}
+{"version":3,"file":"workspace-registry-model.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-registry-model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEjG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAExE,MAAM,MAAM,oBAAoB,GAAG,KAAK,GAAG,SAAS,CAAC;AACrD,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG,UAAU,GAAG,WAAW,CAAC;AAEjF,MAAM,WAAW,0BAA0B;IACzC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,sBAAsB,CAAC;IACtC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,oBAAoB,CAAC;CACnC;AAED,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;IAC7C,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACzD;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B,GAAG,MAAM,CAG3F;AAiDD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GAAG,MAAM,CAYT;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAQpE;AAQD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,MAAM,CAMT;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,MAAM,CAKT;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,oBAAoB,CAE5F;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,sBAAsB,CAKhG;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE;IACH,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GACA,0BAA0B,CAgC5B;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAgBtB;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,uBAAuB,CAO1B;AAED,wBAAgB,qCAAqC,CAAC,KAAK,EAAE;IAC3D,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,0BAA0B,CA8B7B"}

package/dist/server/server/workspace-registry-model.js

@@ -58,7 +58,7 @@ export function deriveProjectGroupingKey(options) {
         return remoteKey;
     }
     const mainRepoRoot = options.mainRepoRoot?.trim();
-    if (options.isPaseoOwnedWorktree && mainRepoRoot) {
+    if (mainRepoRoot) {
         return mainRepoRoot;
     }
     return options.cwd;
@@ -84,7 +84,7 @@ export function deriveWorkspaceDisplayName(input) {
     return deriveWorkspaceDirectoryName(input.cwd);
 }
 export function deriveProjectRootPath(input) {
-    if (input.checkout.isGit && input.checkout.isPaseoOwnedWorktree) {
+    if (input.checkout.isGit && input.checkout.mainRepoRoot) {
         return input.checkout.mainRepoRoot;
     }
     return input.cwd;
@@ -96,7 +96,7 @@ export function deriveWorkspaceKind(checkout) {
     if (!checkout.isGit) {
         return "directory";
     }
-    return checkout.isPaseoOwnedWorktree ? "worktree" : "local_checkout";
+    return checkout.mainRepoRoot ? "worktree" : "local_checkout";
 }
 export function checkoutLiteFromGitSnapshot(cwd, git) {
     if (!git.isGit) {
@@ -128,43 +128,57 @@ export function checkoutLiteFromGitSnapshot(cwd, git) {
         remoteUrl: git.remoteUrl,
         worktreeRoot: git.repoRoot ?? cwd,
         isPaseoOwnedWorktree: false,
-        mainRepoRoot: null,
+        mainRepoRoot: git.mainRepoRoot,
     };
 }
 export async function detectStaleWorkspaces(input) {
     const staleWorkspaceIds = new Set();
-    for (const workspace of input.activeWorkspaces) {
-        const dirExists = await input.checkDirectoryExists(workspace.cwd);
-        if (!dirExists) {
+    const existenceChecks = await Promise.all(input.activeWorkspaces.map(async (workspace) => ({
+        workspace,
+        exists: await input.checkDirectoryExists(workspace.cwd),
+    })));
+    for (const { workspace, exists } of existenceChecks) {
+        if (!exists) {
             staleWorkspaceIds.add(workspace.workspaceId);
         }
     }
     return staleWorkspaceIds;
 }
-export async function buildProjectPlacementForCwd(input) {
+export function buildProjectPlacementForCwd(input) {
+    const membership = classifyDirectoryForProjectMembership(input);
+    return {
+        projectKey: membership.projectKey,
+        projectName: membership.projectName,
+        checkout: membership.checkout,
+    };
+}
+export function classifyDirectoryForProjectMembership(input) {
     const normalizedCwd = normalizeWorkspaceId(input.cwd);
-    const checkout = await input.workspaceGitService
-        .getSnapshot(normalizedCwd)
-        .then((snapshot) => checkoutLiteFromGitSnapshot(normalizedCwd, snapshot.git))
-        .catch(() => ({
+    const checkout = {
+        ...input.checkout,
         cwd: normalizedCwd,
-        isGit: false,
-        currentBranch: null,
-        remoteUrl: null,
-        worktreeRoot: null,
-        isPaseoOwnedWorktree: false,
-        mainRepoRoot: null,
-    }));
+    };
     const projectKey = deriveProjectGroupingKey({
         cwd: checkout.worktreeRoot ?? normalizedCwd,
         remoteUrl: checkout.remoteUrl,
-        isPaseoOwnedWorktree: checkout.isPaseoOwnedWorktree,
         mainRepoRoot: checkout.mainRepoRoot,
     });
     return {
+        cwd: normalizedCwd,
+        checkout,
+        workspaceId: deriveWorkspaceId(normalizedCwd, checkout),
+        workspaceKind: deriveWorkspaceKind(checkout),
+        workspaceDisplayName: deriveWorkspaceDisplayName({
+            cwd: normalizedCwd,
+            checkout,
+        }),
         projectKey,
         projectName: deriveProjectGroupingName(projectKey),
-        checkout,
+        projectRootPath: deriveProjectRootPath({
+            cwd: normalizedCwd,
+            checkout,
+        }),
+        projectKind: deriveProjectKind(checkout),
     };
 }
 //# sourceMappingURL=workspace-registry-model.js.map

package/dist/server/server/workspace-registry-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-registry-model.js","sourceRoot":"","sources":["../../../src/server/workspace-registry-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-registry-model.js","sourceRoot":"","sources":["../../../src/server/workspace-registry-model.ts"],"names":[],"mappings":"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"}

package/dist/server/server/workspace-registry.d.ts

@@ -39,7 +39,7 @@ declare const PersistedWorkspaceRecordSchema: z.ZodObject<{
     cwd: string;
     createdAt: string;
     updatedAt: string;
-    kind: "directory" | "local_checkout" | "worktree";
+    kind: "worktree" | "directory" | "local_checkout";
     archivedAt: string | null;
     projectId: string;
     workspaceId: string;
@@ -48,7 +48,7 @@ declare const PersistedWorkspaceRecordSchema: z.ZodObject<{
     cwd: string;
     createdAt: string;
     updatedAt: string;
-    kind: "directory" | "local_checkout" | "worktree";
+    kind: "worktree" | "directory" | "local_checkout";
     archivedAt: string | null;
     projectId: string;
     workspaceId: string;

package/dist/server/server/workspace-script-runtime-store.d.ts

@@ -6,10 +6,10 @@ export interface ScriptRuntimeEntry {
     terminalId: string;
     exitCode: number | null;
 }
-type RuntimeEntryKey = {
+interface RuntimeEntryKey {
     workspaceId: string;
     scriptName: string;
-};
+}
 export declare class WorkspaceScriptRuntimeStore {
     private readonly entries;
     private readonly scriptsByWorkspace;

package/dist/server/server/workspace-script-runtime-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-script-runtime-store.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-script-runtime-store.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;IACjE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAkC;IAErE,GAAG,CAAC,GAAG,EAAE,eAAe,GAAG,kBAAkB,GAAG,IAAI;IAKpD,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAYpC,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IAWlC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAqB3D,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO7C,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAIxC,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,8BAA8B;IAatC,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;CAGvB"}
+{"version":3,"file":"workspace-script-runtime-store.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-script-runtime-store.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;IACjE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAkC;IAErE,GAAG,CAAC,GAAG,EAAE,eAAe,GAAG,kBAAkB,GAAG,IAAI;IAKpD,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAYpC,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IAWlC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAqB3D,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO7C,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAIxC,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,8BAA8B;IAatC,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;CAGvB"}

package/dist/server/server/workspace-service-env.js

@@ -68,9 +68,9 @@ export function assertNoServiceEnvNameCollisions(scriptNames) {
         scriptNamesByEnvName.set(envName, namesForEnvName);
     }
     const collisions = [];
-    for (const [envName, scriptNames] of scriptNamesByEnvName) {
-        if (scriptNames.length > 1) {
-            collisions.push(`Service env name collision for ${envName}: ${scriptNames.join(", ")}`);
+    for (const [envName, names] of scriptNamesByEnvName) {
+        if (names.length > 1) {
+            collisions.push(`Service env name collision for ${envName}: ${names.join(", ")}`);
         }
     }
     if (collisions.length > 0) {