* fix(projects): restore cross-host grouping Random host-local project IDs replaced the remote-derived value that had also served as grouping identity. Persist a separate opaque group key and let normal boot reconciliation backfill older records without a migration. * fix(projects): keep ambiguous clones separate A shared remote can identify a project across hosts, but it cannot distinguish two independent clones on one host. Treat those keys as ambiguous so host-local project IDs remain separate. * fix(projects): preserve host-local project identity * fix(projects): strengthen grouping identity * test(app): update project host shape contract * fix(projects): preserve selected host identity * fix(projects): close grouped routing gaps * fix(projects): stabilize legacy subproject grouping * fix(projects): preserve selected project identity * fix(projects): isolate legacy host identity * fix(projects): preserve symlinked bootstrap roots * fix(projects): reconcile grouped custom names * fix(projects): stabilize settings and path identity * fix(projects): normalize default remote ports * fix(projects): harden host and remote identity * fix(projects): preserve host-scoped actions * fix(projects): preserve remote path semantics * fix(projects): model SCP remote semantics * fix(projects): keep settings on routed host * fix(projects): preserve SSH URL path semantics * fix(projects): separate identity from presentation * test(projects): use grouped identity in UI specs * fix(projects): harden grouped project routing * test(projects): expect framed settings route * fix(projects): preserve exact placement identity * fix(projects): harden grouping identity and routing * fix(projects): restore project key as grouping identity Random host-local project IDs had replaced the persisted cross-host value carried by projectKey. Keep projectId for routing while reconciliation owns and persists projectKey for grouping. * fix(projects): prevent project key collisions Preserve platform path semantics and generic remote transports in cross-host keys, and compare legacy checkout roots using filesystem equivalence before materializing ownership. * test(projects): assert host-scoped project keys * fix(projects): preserve project key compatibility Resolve legacy workspace project references at the daemon boundary while keeping projectKey as the cross-host identity. Complete generic SSH normalization without collapsing distinct repositories. * fix(projects): harden project reference identity * fix(projects): retain archived reference errors * fix(projects): scope legacy paths to hosts * test(app): model persisted project keys * fix(projects): retain absolute scp users * fix(projects): resolve legacy mutation aliases * fix(projects): preserve conservative identity boundaries * fix(projects): preserve legacy placement identity * test(projects): assert legacy placement identity * test(projects): expect canonical Windows keys * fix(projects): separate bootstrap identity fields * fix(projects): scope legacy paths by host * fix(projects): stabilize opaque project identity * fix(projects): preserve remaining opaque identities * fix(projects): classify forward-slash UNC roots * fix(projects): preserve opaque selection keys * fix(projects): frame host-local project keys * fix(projects): canonicalize framed identities * test(projects): isolate repeated remote fixtures * fix(projects): keep project key as UI identity * fix(projects): reconcile hydrated project references * fix(projects): preserve archived project identity * refactor(projects): group projects from project records, not workspaces Cross-host grouping had been built by hanging a projectKey off every workspace descriptor. That scoped the key to the wrong entity: the app then had to reconstruct project identity per workspace in six modules, which forced projectKey fallbacks into RPC arguments and a server-side resolver that turned grouping keys back into project ids. A workspace has a projectId. The key belongs to the project, and grouping is a display concern, so the daemon now publishes projects over project.list plus the existing project.update channel and the app groups them in one place. Projects are addressed by host-local projectId everywhere, including the settings route. Projects persisted without a key are backfilled by ordinary boot reconciliation, with no migration. Old daemons advertise no projectList capability and simply do not group. * test(projects): seed projects alongside workspaces in fixtures Sidebar fixtures seeded workspaces without their projects, which the daemon cannot produce now that projects arrive on their own channel, so nothing rendered. Adds a seeding helper that supplies both. Also drops the provisioning test for accepting a project key where a project id belongs; that resolver was removed deliberately. * fix(projects): keep derived project identity stable Four gaps left by shrinking the key derivation: Local keys used a bare path resolve, so one directory reached by a different spelling produced a different key and reset grouped identity. Windows CI caught this with the 8.3 and long-name forms of one temp path. Canonicalize through the shared realpath-aware normalization. Subproject display names lost their selected-path input, so every subproject of a monorepo rendered under the same remote-derived name. Reconciliation only ever backfilled a missing key, so a project whose remote changed stayed grouped with hosts on the old remote. Project settings kept a disconnected host selected and rendered a dead end with no way back to an editable host. * fix(projects): read scheme remotes as URLs, not scp form An `ssh://user@host:22/org/repo` remote matched the scp-form pattern first, because `[^@]+` happily eats `ssh://git`, so the port landed in the path and the project keyed as `remote:host/22/org/repo`. Two spellings of one remote therefore never grouped. Try scp form only when there is no scheme, and drop protocol-default ports so an explicitly written `:22` matches the same remote without it.
180 lines
6.3 KiB
TypeScript
180 lines
6.3 KiB
TypeScript
import os from "node:os";
|
|
import { realpathSync } from "node:fs";
|
|
import nodePath from "node:path";
|
|
|
|
/**
|
|
* Expand tilde in path to home directory
|
|
*/
|
|
export function expandTilde(path: string): string {
|
|
if (path.startsWith("~/")) {
|
|
const homeDir = process.env.HOME || os.homedir();
|
|
return path.replace("~", homeDir);
|
|
}
|
|
if (path === "~") {
|
|
return process.env.HOME || os.homedir();
|
|
}
|
|
return path;
|
|
}
|
|
|
|
/**
|
|
* Compare two path strings as filesystem-equivalent for cwd filtering.
|
|
*
|
|
* This is a string-only comparison: it normalizes separators and dot segments,
|
|
* ignores trailing separators, strips Windows namespace prefixes, and
|
|
* case-folds only when comparing as Windows. It does not resolve symlinks or
|
|
* check whether either path exists.
|
|
*/
|
|
export function areEquivalentPaths(left: string, right: string): boolean {
|
|
const compareAsWindows = shouldCompareAsWindows(left, right);
|
|
return (
|
|
normalizePathForComparison(left, compareAsWindows) ===
|
|
normalizePathForComparison(right, compareAsWindows)
|
|
);
|
|
}
|
|
|
|
export function createPathEquivalenceMatcher(target: string): (candidate: string) => boolean {
|
|
const targetLooksWindows = looksLikeDefiniteWindowsPath(target);
|
|
const compareAsWindows = targetLooksWindows;
|
|
const normalizedTarget = normalizePathForComparison(target, compareAsWindows);
|
|
|
|
return (candidate) => {
|
|
const candidateCompareAsWindows = compareAsWindows || looksLikeDefiniteWindowsPath(candidate);
|
|
const comparableTarget =
|
|
candidateCompareAsWindows === compareAsWindows
|
|
? normalizedTarget
|
|
: normalizePathForComparison(target, candidateCompareAsWindows);
|
|
return normalizePathForComparison(candidate, candidateCompareAsWindows) === comparableTarget;
|
|
};
|
|
}
|
|
|
|
export function createRealpathAwarePathMatcher(target: string): (candidate: string) => boolean {
|
|
const targetMatchers = collectPathVariants(target).map((variant) =>
|
|
createPathEquivalenceMatcher(variant),
|
|
);
|
|
|
|
return (candidate) => {
|
|
const candidateVariants = collectPathVariants(candidate);
|
|
return candidateVariants.some((variant) => targetMatchers.some((matches) => matches(variant)));
|
|
};
|
|
}
|
|
|
|
export function isPathInsideRoot(root: string, candidate: string): boolean {
|
|
return getRelativePathInsideRoot(root, candidate) !== null;
|
|
}
|
|
|
|
export function normalizePathForIdentity(value: string): string {
|
|
const canonicalPath = resolveRealpathVariants(value)[0] ?? value;
|
|
return normalizePathForComparison(canonicalPath, looksLikeDefiniteWindowsPath(canonicalPath));
|
|
}
|
|
|
|
/**
|
|
* Returns the candidate's relative suffix when it is inside root.
|
|
*
|
|
* The suffix is derived from the same lexical path pair used to prove
|
|
* containment. Callers that map an existing filesystem path into a new root
|
|
* must keep those two operations coupled.
|
|
*/
|
|
export function getRealpathAwareRelativePath(root: string, candidate: string): string | null {
|
|
const rootVariants = collectPathVariants(root);
|
|
const candidateVariants = collectPathVariants(candidate);
|
|
|
|
for (const rootVariant of rootVariants) {
|
|
for (const candidateVariant of candidateVariants) {
|
|
const relativePath = getRelativePathInsideRoot(rootVariant, candidateVariant);
|
|
if (relativePath !== null) return relativePath;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
export function isRealpathInsideRoot(root: string, candidate: string): boolean {
|
|
return getRealpathAwareRelativePath(root, candidate) !== null;
|
|
}
|
|
|
|
function getRelativePathInsideRoot(root: string, candidate: string): string | null {
|
|
const compareAsWindows = shouldCompareAsWindows(root, candidate);
|
|
const platformPath = compareAsWindows ? nodePath.win32 : nodePath.posix;
|
|
const normalizedRoot = normalizePathForComparison(root, compareAsWindows);
|
|
const normalizedCandidate = normalizePathForComparison(candidate, compareAsWindows);
|
|
const relative = platformPath.relative(normalizedRoot, normalizedCandidate);
|
|
|
|
return relative === "" || (!relative.startsWith("..") && !platformPath.isAbsolute(relative))
|
|
? relative
|
|
: null;
|
|
}
|
|
|
|
function collectPathVariants(value: string): string[] {
|
|
const variants = new Set<string>([value]);
|
|
for (const realpath of resolveRealpathVariants(value)) {
|
|
variants.add(realpath);
|
|
}
|
|
return Array.from(variants);
|
|
}
|
|
|
|
function resolveRealpathVariants(value: string): string[] {
|
|
const variants: string[] = [];
|
|
try {
|
|
variants.push(realpathSync.native(value));
|
|
} catch {
|
|
// Path may not exist, or the platform may reject this link flavor.
|
|
}
|
|
try {
|
|
variants.push(realpathSync(value));
|
|
} catch {
|
|
// Keep string-only comparison as the fallback.
|
|
}
|
|
return variants;
|
|
}
|
|
|
|
function shouldCompareAsWindows(left: string, right: string): boolean {
|
|
return looksLikeDefiniteWindowsPath(left) || looksLikeDefiniteWindowsPath(right);
|
|
}
|
|
|
|
function looksLikeDefiniteWindowsPath(value: string): boolean {
|
|
return (
|
|
/^[a-zA-Z]:[\\/]/u.test(value) ||
|
|
/^[/\\]{2}\?[/\\]/u.test(value) ||
|
|
/^\\{2}[^/\\]+[/\\][^/\\]+/u.test(value)
|
|
);
|
|
}
|
|
|
|
function normalizePathForComparison(value: string, compareAsWindows: boolean): string {
|
|
const platformPath = compareAsWindows ? nodePath.win32 : nodePath.posix;
|
|
const comparableValue = compareAsWindows ? stripWindowsNamespacePrefix(value) : value;
|
|
const platformNormalized = platformPath.normalize(comparableValue);
|
|
const normalized = stripTrailingSeparators(
|
|
platformNormalized,
|
|
platformPath.parse(platformNormalized).root,
|
|
compareAsWindows,
|
|
);
|
|
return compareAsWindows ? normalized.toLowerCase() : normalized;
|
|
}
|
|
|
|
function stripWindowsNamespacePrefix(value: string): string {
|
|
const driveMatch = value.match(/^[/\\]{2}\?[/\\]([a-zA-Z]:)[/\\](.*)$/u);
|
|
const drivePrefix = driveMatch?.[1];
|
|
if (drivePrefix) {
|
|
return `${drivePrefix}\\${driveMatch[2] ?? ""}`;
|
|
}
|
|
|
|
const uncMatch = value.match(/^[/\\]{2}\?[/\\]UNC[/\\]([^/\\]+)[/\\]([^/\\]+)(?:[/\\](.*))?$/iu);
|
|
const uncServer = uncMatch?.[1];
|
|
const uncShare = uncMatch?.[2];
|
|
if (uncServer && uncShare) {
|
|
const uncRest = uncMatch[3];
|
|
return `\\\\${uncServer}\\${uncShare}${uncRest !== undefined ? `\\${uncRest}` : ""}`;
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
function stripTrailingSeparators(value: string, root: string, compareAsWindows: boolean): string {
|
|
const separatorPattern = compareAsWindows ? /[\\/]/u : /\//u;
|
|
let result = value;
|
|
while (result.length > root.length && separatorPattern.test(result.at(-1) ?? "")) {
|
|
result = result.slice(0, -1);
|
|
}
|
|
return result;
|
|
}
|