zyrk 0.5.0 → 0.5.2

package/dist/install/registry-policy.js

@@ -0,0 +1,30 @@
+/** Credential-free routing captured with the exact installed generation. */
+import { cleanUrl, lockMismatch } from "./lock.js";
+export function installedRegistryConfig(state, nodes) {
+    const object = (x) => !!x && typeof x === "object" && !Array.isArray(x);
+    const raw = state.registryConfig;
+    if (raw === undefined) {
+        const origins = new Set(nodes.map((n) => n.origin));
+        if (origins.size !== 1)
+            throw lockMismatch("legacy installed state has no exact registry routing");
+        return { registry: [...origins][0] };
+    }
+    if (!object(raw) ||
+        Object.keys(raw).some((k) => !["registry", "registries"].includes(k)) ||
+        typeof raw.registry !== "string" ||
+        !cleanUrl(raw.registry) ||
+        !object(raw.registries) ||
+        Object.entries(raw.registries).some(([scope, url]) => !/^@[a-z0-9][a-z0-9._-]*$/.test(scope) ||
+            typeof url !== "string" ||
+            !cleanUrl(url)))
+        throw lockMismatch("installed registry routing is malformed");
+    const registries = raw.registries;
+    for (const node of nodes) {
+        const expected = node.name.startsWith("@")
+            ? (registries[node.name.slice(0, node.name.indexOf("/"))] ?? raw.registry)
+            : raw.registry;
+        if (node.origin !== expected)
+            throw lockMismatch("installed registry routing disagrees with selected sources");
+    }
+    return { registry: raw.registry, registries };
+}

package/dist/install/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/install/registry.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAoB,MAAM,sBAAsB,CAAC;AAKxE,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,cAAc,CAAC,CAwI1B"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/install/registry.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAoB,MAAM,sBAAsB,CAAC;AAKxE,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,cAAc,CAAC,CAuI1B"}

package/dist/install/registry.js

@@ -11,6 +11,7 @@ import { cleanUrl } from "./lock.js";
 export async function installRegistry(options) {
     let registry = DEFAULT_REGISTRY;
     const auth = {};
+    const scopedRegistries = {};
     const home = options.env.HOME ?? os.homedir();
     const project = (await findWorkspaceRoot(options.cwd)) ??
         (await findProjectBoundary(options.cwd)) ??
@@ -64,9 +65,7 @@ export async function installRegistry(options) {
             if (key === "registry")
                 registry = value;
             if (/^@.+:registry$/.test(key))
-                throw new ZyrkError("ZYRK_POLICY_DENIED", "Scoped registry routing is not supported by native commands yet.", {
-                    remedy: "Use npm for mixed-registry projects; zyrk will not silently fetch a private scope from a public registry.",
-                });
+                scopedRegistries[key.slice(0, -9)] = value;
             if (key === "strict-ssl" && value === "false")
                 throw new ZyrkError("ZYRK_POLICY_DENIED", "Disabling registry TLS verification is not supported.", {
                     remedy: "Configure a trusted HTTPS registry with valid TLS certificates.",
@@ -80,18 +79,24 @@ export async function installRegistry(options) {
             options.env.npm_config_registry ??
             options.env.NPM_CONFIG_REGISTRY ??
             registry;
-    if (!cleanUrl(registry))
-        throw new ZyrkError("ZYRK_POLICY_DENIED", "Registry URL must be HTTP(S) without credentials, query parameters, or fragments.", {
-            remedy: "Use a credential-free registry URL and configure URL-scoped credentials separately in .npmrc.",
-        });
-    const url = new URL(registry);
-    if (url.protocol !== "https:" &&
-        !["127.0.0.1", "localhost", "[::1]"].includes(url.hostname))
-        throw new ZyrkError("ZYRK_POLICY_DENIED", "Remote registries require HTTPS.", {
-            remedy: "Select an HTTPS registry; HTTP is limited to loopback development registries.",
-        });
+    const validate = (registry) => {
+        if (!cleanUrl(registry))
+            throw new ZyrkError("ZYRK_POLICY_DENIED", "Registry URL must be HTTP(S) without credentials, query parameters, or fragments.", {
+                remedy: "Use a credential-free registry URL and configure URL-scoped credentials separately in .npmrc.",
+            });
+        const url = new URL(registry);
+        if (url.protocol !== "https:" &&
+            !["127.0.0.1", "localhost", "[::1]"].includes(url.hostname))
+            throw new ZyrkError("ZYRK_POLICY_DENIED", "Remote registries require HTTPS.", {
+                remedy: "Select an HTTPS registry; HTTP is limited to loopback development registries.",
+            });
+    };
+    validate(registry);
+    for (const selected of Object.values(scopedRegistries))
+        validate(selected);
     return new RegistryClient({
         registry,
+        scopedRegistries,
         userAgent: `zyrk/${options.version}`,
         fetchOptions: auth,
     });

package/dist/install/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/install/run.ts"],"names":[],"mappings":"AAIA,OAAO,EAOL,KAAK,cAAc,EACpB,MAAM,cAAc,CAAC;AAWtB,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAgC3C,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE;QACZ,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EACL,OAAO,GACP,uBAAuB,GACvB,eAAe,GACf,SAAS,GACT,cAAc,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;CAC3B,CAAC;AA6GF,wBAAsB,cAAc,CAClC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CA4wBxB"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/install/run.ts"],"names":[],"mappings":"AAIA,OAAO,EAOL,KAAK,cAAc,EACpB,MAAM,cAAc,CAAC;AAYtB,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAgC3C,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE;QACZ,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EACL,OAAO,GACP,uBAAuB,GACvB,eAAe,GACf,SAAS,GACT,cAAc,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;CAC3B,CAAC;AA4GF,wBAAsB,cAAc,CAClC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CAyyBxB"}

package/dist/install/run.js

@@ -6,6 +6,7 @@ import { candidates, candidateDigest, approveCandidate, assertApproved, material
 import { loadProjectPatches, applyProjectPatches } from "../commands/patch.js";
 import { registerGeneration } from "./metadata.js";
 import { randomId } from "../util/ids.js";
+import { createRootOverrides } from "../resolve/overrides.js";
 import { importNpmLock } from "./import-npm.js";
 /** Native project install: resolve -> verify -> realize -> journaled publication. */
 import { readFile, realpath, lstat, mkdir, rm } from "node:fs/promises";
@@ -65,10 +66,9 @@ async function readManifest(project) {
             throw error("ZYRK_MANIFEST_INVALID", `Project ${group} must contain valid package names and string specifiers.`);
     }
     if (doc.workspaces !== undefined ||
-        doc.overrides !== undefined ||
         doc.bundledDependencies !== undefined ||
         doc.bundleDependencies !== undefined)
-        throw error("ZYRK_NOT_IMPLEMENTED", "Project workspaces, overrides, and bundled dependencies are not supported by install yet.");
+        throw error("ZYRK_NOT_IMPLEMENTED", "Project workspaces and bundled dependencies are not supported by install yet.");
     if (doc.zyrk !== undefined &&
         (!object(doc.zyrk) ||
             Object.keys(doc.zyrk).some((key) => !["scripts", "audit", "patches", "mutablePackages"].includes(key)) ||
@@ -98,6 +98,13 @@ export async function installProject(options) {
         return installWorkspaceProject(options);
     }
     const project = await realpath(options.projectDir);
+    const preliminaryManifest = (await readManifest(project)).doc;
+    const preliminaryOverrides = createRootOverrides(preliminaryManifest);
+    if (options.importNpm) {
+        const preliminaryLock = (await readLockfile(path.join(project, "package-lock.json")))?.doc;
+        if (preliminaryLock && !preliminaryLock.zyrk)
+            importNpmLock(preliminaryLock, requirements(preliminaryManifest), (name) => options.registry.originFor(name), preliminaryOverrides);
+    }
     // A local control-directory link would redirect locks and recovery writes.
     const local = path.join(project, PROJECT_STATE_DIR);
     try {
@@ -189,6 +196,7 @@ export async function installProject(options) {
                 if (other !== group && manifest[other])
                     delete manifest[other][parsed.name];
         }
+        const overrides = createRootOverrides(manifest);
         const allDeps = requirements(manifest);
         for (const [name, spec] of Object.entries(allDeps))
             parseRequirement(name, spec);
@@ -197,6 +205,7 @@ export async function installProject(options) {
             scripts: scriptPolicyFingerprint(scriptPolicy(manifest)),
             config: configFingerprint({
                 registry: options.registry.origin,
+                registries: options.registry.scopedRegistries,
                 linker: "shared",
                 platform: currentPlatform(),
                 ...(object(manifest.zyrk) &&
@@ -214,7 +223,7 @@ export async function installProject(options) {
         if (existing && !existing.zyrk) {
             if (options.frozen || options.offline || specs.length)
                 throw lockMismatch("npm-only lockfile requires a non-frozen adoption install before adding packages");
-            resolved = importNpmLock(existing, allDeps, options.registry.origin);
+            resolved = importNpmLock(existing, allDeps, (name) => options.registry.originFor(name), overrides);
         }
         if (existing?.zyrk &&
             specs.length === 0 &&
@@ -240,8 +249,10 @@ export async function installProject(options) {
             const prior = existing?.zyrk ? lockedGraph(existing) : undefined;
             const fresh = new Set(specs.map((spec) => npa(spec).name));
             resolved = await resolveRequirements({
+                overrides,
                 provider: {
                     origin: options.registry.origin,
+                    originFor: (name) => options.registry.originFor(name),
                     packument: (name) => options.registry.packument(name, {
                         signal: operation.operation.signal,
                     }),
@@ -342,7 +353,7 @@ export async function installProject(options) {
             if (!packageName(node.name) ||
                 !cleanUrl(node.origin) ||
                 !cleanUrl(node.tarballUrl) ||
-                node.origin !== options.registry.origin)
+                node.origin !== options.registry.originFor(node.name))
                 throw error("ZYRK_POLICY_DENIED", "Selected source has an unsupported or credential-bearing registry origin or archive URL.");
         }
         const selectedRoots = resolved.roots.filter((r) => !options.omitDev ||
@@ -458,7 +469,9 @@ export async function installProject(options) {
             if (options.offline)
                 throw error("ZYRK_OFFLINE_MISSING", `Verified source for ${node.name}@${node.version} is missing from the store.`);
             const tarball = path.join(txn.dir, `${node.sourceId}.tgz`);
-            const download = await options.registry.downloadTarball({
+            const download = await options.registry
+                .forPackage(node.name)
+                .downloadTarball({
                 signal: operation.operation.signal,
                 onBytes: operation.operation.consumeArchiveBytes,
                 url: node.tarballUrl,
@@ -680,6 +693,10 @@ export async function installProject(options) {
                 instances: registration.instances,
                 activeContexts: registration.contexts,
                 lockDigest: sha512Hex(canonicalJson(doc)),
+                registryConfig: {
+                    registry: options.registry.origin,
+                    registries: options.registry.scopedRegistries,
+                },
                 graphDigest: digest,
                 platform: process.platform,
                 arch: process.arch,

package/dist/install/workspace-graph.d.ts

@@ -46,17 +46,23 @@ export type WorkspaceGraph = {
         reason: "platform";
     }>;
 };
-export declare function resolveWorkspaceGraph(project: WorkspaceProject, provider: MetadataProvider, options?: {
+declare function resolveWorkspaceGraphPass(project: WorkspaceProject, provider: MetadataProvider, options?: {
     previous?: WorkspaceGraph;
     fresh?: ReadonlySet<string>;
     platform?: RuntimePlatform;
     maxNodes?: number;
     maxDepth?: number;
     deadlineMs?: number;
+}, overrideState?: {
+    policy: import("../resolve/overrides.ts").OverridePolicy;
+    contexts: Map<string, import("../resolve/overrides.ts").OverrideContext>;
 }): Promise<WorkspaceGraph>;
+/** Retry pure planning when a registry edge narrows a live importer's scope. */
+export declare function resolveWorkspaceGraph(project: WorkspaceProject, provider: MetadataProvider, options?: Parameters<typeof resolveWorkspaceGraphPass>[2]): Promise<WorkspaceGraph>;
 export declare function workspaceRegistryOccurrences(graph: WorkspaceGraph): ResolvedOccurrence[];
 /** Rooted semantic context including live source identity; occurrence keys never split equal peers. */
 export declare function workspaceContextId(graph: WorkspaceGraph, rootKey: string, projectId: string): string;
 /** Recheck locked platform/runtime requirements as strictly as fresh resolution. */
 export declare function assertWorkspacePlatform(graph: WorkspaceGraph): void;
+export {};
 //# sourceMappingURL=workspace-graph.d.ts.map

package/dist/install/workspace-graph.d.ts.map

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

package/dist/install/workspace-graph.js

@@ -2,6 +2,7 @@
 import { maxSatisfying, satisfies, valid } from "semver";
 import { expectedIntegrityFromDist, } from "../fetch/registry.js";
 import { currentPlatform } from "../resolve/resolver.js";
+import { workspaceOverrides, refineWorkspaceOverride, WorkspaceOverrideRestart, } from "./workspace-overrides.js";
 import { parseRequirement } from "../resolve/spec.js";
 import { sourceIdOf, sha512Hex } from "../util/hash.js";
 import { ZyrkError } from "../errors.js";
@@ -14,7 +15,9 @@ const fail = (reason) => {
 };
 class PlatformMismatch extends Error {
 }
-export async function resolveWorkspaceGraph(project, provider, options = {}) {
+async function resolveWorkspaceGraphPass(project, provider, options = {}, overrideState = workspaceOverrides(project)) {
+    const overrides = overrideState.policy;
+    const overrideContexts = new Map(overrideState.contexts);
     const graph = { nodes: [], importers: {}, omissions: [] };
     const byKey = new Map(), manifests = new Map(), chains = new Map();
     const metadata = new Map();
@@ -83,6 +86,10 @@ export async function resolveWorkspaceGraph(project, provider, options = {}) {
     const build = async (parent, name, spec, kind, ancestry, explicitLocal) => {
         check(ancestry.length);
         try {
+            const overridden = overrides.select(overrideContexts.get(parent.key), name, spec);
+            if (overridden.spec !== spec)
+                explicitLocal = undefined;
+            spec = overridden.spec;
             let local = explicitLocal === undefined
                 ? undefined
                 : project.importers.find((item) => item.id === explicitLocal);
@@ -106,8 +113,11 @@ export async function resolveWorkspaceGraph(project, provider, options = {}) {
                         local = candidate;
                 }
             }
-            if (local)
-                return graph.importers[local.id];
+            if (local) {
+                const key = graph.importers[local.id];
+                refineWorkspaceOverride(overrideState.contexts, key, overridden.context);
+                return key;
+            }
             if (!requirement)
                 throw lockMismatch("missing workspace requirement");
             const doc = await packument(requirement.realName);
@@ -145,13 +155,15 @@ export async function resolveWorkspaceGraph(project, provider, options = {}) {
                 .map((key) => byKey.get(key))
                 .find((node) => node?.kind === "registry" &&
                 node.name === requirement.realName &&
-                node.version === version);
+                node.version === version &&
+                overrideContexts.get(node.key)?.id === overridden.context.id);
             if (ancestor)
                 return ancestor.key;
             const key = `${requirement.realName}@${version}#${sha512Hex(parent.key + "\0" + name).slice(0, 16)}`;
             if (byKey.has(key))
                 return key;
-            if (!cleanUrl(provider.origin) || !cleanUrl(entry.dist.tarball))
+            const origin = provider.originFor?.(requirement.realName) ?? provider.origin;
+            if (!cleanUrl(origin) || !cleanUrl(entry.dist.tarball))
                 fail("unsafe registry source metadata");
             const bin = typeof entry.bin === "string"
                 ? { [requirement.realName.split("/").at(-1)]: entry.bin }
@@ -165,10 +177,10 @@ export async function resolveWorkspaceGraph(project, provider, options = {}) {
                     sourceType: "registry",
                     name: requirement.realName,
                     version,
-                    origin: provider.origin,
+                    origin,
                     integrity,
                 }),
-                origin: provider.origin,
+                origin,
                 integrity,
                 tarballUrl: entry.dist.tarball,
                 bin,
@@ -183,6 +195,7 @@ export async function resolveWorkspaceGraph(project, provider, options = {}) {
                 optionalPeers: [],
             };
             graph.nodes.push(node);
+            overrideContexts.set(key, overridden.context);
             byKey.set(key, node);
             manifests.set(key, entry);
             chains.set(key, [...ancestry, parent.key]);
@@ -234,7 +247,8 @@ export async function resolveWorkspaceGraph(project, provider, options = {}) {
         for (const node of graph.nodes) {
             check();
             const manifest = manifests.get(node.key);
-            for (const [name, range] of Object.entries(manifest.peerDependencies ?? {}).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))) {
+            for (const [name, rawRange] of Object.entries(manifest.peerDependencies ?? {}).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))) {
+                const range = overrides.select(overrideContexts.get(node.key), name, rawRange).spec;
                 const optional = manifest.peerDependenciesMeta?.[name]?.optional === true;
                 if (optional && !node.optionalPeers.includes(name))
                     node.optionalPeers.push(name);
@@ -256,7 +270,7 @@ export async function resolveWorkspaceGraph(project, provider, options = {}) {
                     const selected = byKey.get(target);
                     const requested = range.startsWith("workspace:")
                         ? range.slice(10)
-                        : range;
+                        : parseRequirement(name, range).targetSpec;
                     if (!["*", "^", "~"].includes(requested) &&
                         !satisfies(selected.version, requested))
                         throw new ZyrkError("ZYRK_PEER_CONFLICT", `Workspace peer ${name} required by ${node.name} conflicts with its consumer.`, { remedy: "Align the consumer and package peer requirements." });
@@ -293,6 +307,36 @@ export async function resolveWorkspaceGraph(project, provider, options = {}) {
     }
     return fail("peer binding iteration limit exceeded");
 }
+/** Retry pure planning when a registry edge narrows a live importer's scope. */
+export async function resolveWorkspaceGraph(project, provider, options = {}) {
+    const state = workspaceOverrides(project), expires = Date.now() + (options.deadlineMs ?? 30000);
+    const packuments = new Map();
+    const cached = {
+        ...provider,
+        origin: provider.origin,
+        ...(provider.originFor
+            ? { originFor: (name) => provider.originFor(name) }
+            : {}),
+        packument: (name) => {
+            let pending = packuments.get(name);
+            if (!pending) {
+                pending = provider.packument(name);
+                packuments.set(name, pending);
+            }
+            return pending;
+        },
+    };
+    for (let round = 0; round < 128 && Date.now() < expires; round++) {
+        try {
+            return await resolveWorkspaceGraphPass(project, cached, { ...options, deadlineMs: Math.max(1, expires - Date.now()) }, state);
+        }
+        catch (cause) {
+            if (!(cause instanceof WorkspaceOverrideRestart))
+                throw cause;
+        }
+    }
+    throw lockMismatch("workspace override planning resource limit exceeded");
+}
 export function workspaceRegistryOccurrences(graph) {
     return graph.nodes
         .filter((node) => node.kind === "registry")

package/dist/install/workspace-install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-install.d.ts","sourceRoot":"","sources":["../../src/install/workspace-install.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAyH9D,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CAopBxB"}
+{"version":3,"file":"workspace-install.d.ts","sourceRoot":"","sources":["../../src/install/workspace-install.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAyH9D,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CA6pBxB"}

package/dist/install/workspace-install.js

@@ -4,6 +4,7 @@ import { constants } from "node:fs";
 import * as path from "node:path";
 import { discoverWorkspaces, findWorkspaceRoot, assertNoLiveSourceBuilds, } from "./workspaces.js";
 import { resolveWorkspaceGraph, workspaceRegistryOccurrences, workspaceContextId, assertWorkspacePlatform, } from "./workspace-graph.js";
+import { workspaceOverrides } from "./workspace-overrides.js";
 import { importNpmWorkspaceLock } from "./import-npm-workspace.js";
 import { readWorkspaceLock, workspaceLockDoc } from "./workspace-lock.js";
 import { publishWorkspaceProjection, recoverWorkspaceProjection, workspaceProjectionPaths, } from "./workspace-transaction.js";
@@ -61,7 +62,7 @@ async function readNpmWorkspaceImport(root, project, options) {
     catch {
         throw lockMismatch("npm workspace adoption needs an existing readable JSON lock");
     }
-    const graph = importNpmWorkspaceLock(npmDoc, project, options.registry.origin);
+    const graph = importNpmWorkspaceLock(npmDoc, project, (name) => options.registry.originFor(name));
     // Prove the complete graph and ordinary npm projection are representable
     // before any project state is created. Actual policy fingerprints are added
     // under the install lock after policy validation.
@@ -70,6 +71,7 @@ async function readNpmWorkspaceImport(root, project, options) {
         scripts: scriptPolicyFingerprint(undefined),
         config: configFingerprint({
             registry: options.registry.origin,
+            registries: options.registry.scopedRegistries,
             linker: "shared",
         }),
     });
@@ -79,6 +81,7 @@ export async function installWorkspaceProject(options) {
     const root = await findWorkspaceRoot(options.projectDir);
     if (!root)
         throw lockMismatch("no authoritative workspace root");
+    workspaceOverrides(await discoverWorkspaces(root));
     // Refuse untranslatable locks before creating control directories or
     // recovering a previous generation. Revalidate under the project lock below.
     if (options.importNpm)
@@ -98,10 +101,9 @@ export async function installWorkspaceProject(options) {
             await readFile(path.join(i.directory, "package.json"), "utf8"),
         ])));
         const mutation = await prepareWorkspaceMutation(project, options);
-        if (manifest.overrides !== undefined ||
-            manifest.bundledDependencies !== undefined ||
+        if (manifest.bundledDependencies !== undefined ||
             manifest.bundleDependencies !== undefined)
-            unsupported("Workspace overrides and bundled root dependencies are unsupported.");
+            unsupported("Workspace bundled root dependencies are unsupported.");
         const policy = object(manifest.zyrk) ? manifest.zyrk.scripts : undefined;
         if (manifest.zyrk !== undefined &&
             (!object(manifest.zyrk) ||
@@ -131,6 +133,7 @@ export async function installWorkspaceProject(options) {
             scripts: scriptPolicyFingerprint(policy),
             config: configFingerprint({
                 registry: options.registry.origin,
+                registries: options.registry.scopedRegistries,
                 linker: "shared",
                 platform: currentPlatform(),
                 ...(mutable !== undefined
@@ -144,7 +147,7 @@ export async function installWorkspaceProject(options) {
             : undefined;
         let existing = options.importNpm
             ? null
-            : await readWorkspaceLock(root, project, options.registry.origin), graph = imported;
+            : await readWorkspaceLock(root, project, (name) => options.registry.originFor(name)), graph = imported;
         if (existing) {
             const ext = existing.doc.zyrk;
             if (!mutation.changed &&
@@ -160,6 +163,7 @@ export async function installWorkspaceProject(options) {
                 throw lockMismatch("offline/frozen workspace install needs a compatible lock");
             graph = await resolveWorkspaceGraph(project, {
                 origin: options.registry.origin,
+                originFor: (name) => options.registry.originFor(name),
                 packument: (name) => options.registry.packument(name, {
                     signal: operation.operation.signal,
                 }),
@@ -264,7 +268,9 @@ export async function installWorkspaceProject(options) {
                     throw new ZyrkError("ZYRK_OFFLINE_MISSING", `Verified workspace dependency ${node.name}@${node.version} is missing.`, {
                         remedy: "Fetch the exact locked sources online before retrying offline.",
                     });
-                const archive = path.join(txn.dir, `${node.sourceId}.tgz`), download = await options.registry.downloadTarball({
+                const archive = path.join(txn.dir, `${node.sourceId}.tgz`), download = await options.registry
+                    .forPackage(node.name)
+                    .downloadTarball({
                     url: node.tarballUrl,
                     expectedIntegrity: node.integrity,
                     destPath: archive,
@@ -508,6 +514,10 @@ export async function installWorkspaceProject(options) {
                     instances: registration.instances,
                     activeContexts: registration.contexts,
                     lockDigest: sha512Hex(canonicalJson(doc)),
+                    registryConfig: {
+                        registry: options.registry.origin,
+                        registries: options.registry.scopedRegistries,
+                    },
                     graphDigest: graphHash(sourceGraph),
                     platform: process.platform,
                     arch: process.arch,

package/dist/install/workspace-lock.d.ts

@@ -9,7 +9,7 @@ export type WorkspaceFingerprints = {
 export declare function safeImporter(id: unknown): id is string;
 export declare function workspaceLockDoc(project: WorkspaceProject, graph: WorkspaceGraph, fp: WorkspaceFingerprints): NpmLockDoc;
 export declare function validateWorkspaceLockDoc(doc: unknown): WorkspaceGraph;
-export declare function readWorkspaceLock(root: string, project?: WorkspaceProject, registryOrigin?: string): Promise<{
+export declare function readWorkspaceLock(root: string, project?: WorkspaceProject, registryOrigin?: string | ((name: string) => string)): Promise<{
     doc: NpmLockDoc;
     graph: WorkspaceGraph;
 } | null>;

package/dist/install/workspace-lock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-lock.d.ts","sourceRoot":"","sources":["../../src/install/workspace-lock.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AASvD,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,wBAAgB,YAAY,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,MAAM,CAqBtD;AACD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,qBAAqB,GACxB,UAAU,CAyCZ;AACD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,CAgTrE;AACD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,EAC1B,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,GAAG,IAAI,CAAC,CAsC5D"}
+{"version":3,"file":"workspace-lock.d.ts","sourceRoot":"","sources":["../../src/install/workspace-lock.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AASvD,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,wBAAgB,YAAY,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,MAAM,CAqBtD;AACD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,qBAAqB,GACxB,UAAU,CAyCZ;AACD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,CAgTrE;AACD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,EAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,GACnD,OAAO,CAAC;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,GAAG,IAAI,CAAC,CA2C5D"}

package/dist/install/workspace-lock.js

@@ -333,7 +333,11 @@ export async function readWorkspaceLock(root, project, registryOrigin) {
             throw lockMismatch("workspace importer is missing");
     }
     if (registryOrigin &&
-        graph.nodes.some((n) => n.kind === "registry" && n.origin !== registryOrigin))
+        graph.nodes.some((n) => n.kind === "registry" &&
+            n.origin !==
+                (typeof registryOrigin === "string"
+                    ? registryOrigin
+                    : registryOrigin(n.name))))
         throw lockMismatch("workspace registry origin differs");
     return { doc: doc, graph };
 }

package/dist/install/workspace-mutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-mutation.d.ts","sourceRoot":"","sources":["../../src/install/workspace-mutation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAiB3D,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAW3E;AACD,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC;IACT,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACnB,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC,CA8ID"}
+{"version":3,"file":"workspace-mutation.d.ts","sourceRoot":"","sources":["../../src/install/workspace-mutation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAiB3D,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAc3E;AACD,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC;IACT,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACnB,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC,CA8ID"}

package/dist/install/workspace-mutation.js

@@ -18,7 +18,10 @@ export function refreshWorkspaceFingerprint(project) {
         member.id,
         member.manifest.name ?? null,
         member.manifest.version ?? null,
-        manifestFingerprint(member.manifest),
+        manifestFingerprint({
+            ...member.manifest,
+            overrides: member.id === "." ? member.manifest.overrides : undefined,
+        }),
     ])));
 }
 export async function prepareWorkspaceMutation(project, options) {

package/dist/install/workspace-overrides.d.ts

@@ -0,0 +1,11 @@
+import { type OverrideContext } from "../resolve/overrides.ts";
+import { type WorkspaceProject } from "./workspaces.ts";
+export declare function workspaceOverrides(project: WorkspaceProject): {
+    policy: import("../resolve/overrides.ts").OverridePolicy;
+    contexts: Map<string, OverrideContext>;
+};
+/** Internal signal: restart pure planning before any fetch/publication mutation. */
+export declare class WorkspaceOverrideRestart extends Error {
+}
+export declare function refineWorkspaceOverride(contexts: Map<string, OverrideContext>, key: string, incoming: OverrideContext): void;
+//# sourceMappingURL=workspace-overrides.d.ts.map

package/dist/install/workspace-overrides.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-overrides.d.ts","sourceRoot":"","sources":["../../src/install/workspace-overrides.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AAWzB,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB;;;EAuD3D;AACD,oFAAoF;AACpF,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AACtD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,eAAe,GACxB,IAAI,CASN"}

package/dist/install/workspace-overrides.js

@@ -0,0 +1,67 @@
+/** Live importers have one dependency graph; compatible scopes may narrow it. */
+import { satisfies } from "semver";
+import { createRootOverrides, } from "../resolve/overrides.js";
+import { parseRequirement } from "../resolve/spec.js";
+import { planWorkspaceDependencies, } from "./workspaces.js";
+import { lockMismatch } from "./lock.js";
+function ancestor(outer, inner) {
+    for (let current = inner; current; current = current.parent)
+        if (current === outer)
+            return true;
+    return false;
+}
+export function workspaceOverrides(project) {
+    const policy = createRootOverrides(project.importers.find((i) => i.id === ".").manifest);
+    const contexts = new Map();
+    const plans = planWorkspaceDependencies(project);
+    for (const importer of project.importers)
+        contexts.set(`workspace:${importer.id}`, importer.id === "."
+            ? policy.root
+            : policy.select(policy.root, importer.manifest.name, importer.manifest.version).context);
+    for (let round = 0; round <= 128; round++) {
+        let changed = false;
+        for (const plan of plans) {
+            const parent = contexts.get(`workspace:${plan.importer.id}`);
+            for (const edge of plan.dependencies) {
+                const selected = policy.select(parent, edge.name, edge.spec);
+                const localId = edge.selection.kind === "local" ? edge.selection.importer : undefined;
+                let local = project.importers.find((i) => i.id === localId);
+                if (selected.spec !== edge.spec) {
+                    const requirement = parseRequirement(edge.name, selected.spec);
+                    local = project.importers.find((i) => i.id !== "." &&
+                        i.manifest.name === requirement.realName &&
+                        requirement.kind !== "alias" &&
+                        requirement.targetKind !== "tag" &&
+                        satisfies(i.manifest.version, requirement.targetSpec));
+                }
+                if (!local)
+                    continue;
+                const key = `workspace:${local.id}`, current = contexts.get(key);
+                if (ancestor(current, selected.context)) {
+                    if (current !== selected.context) {
+                        contexts.set(key, selected.context);
+                        changed = true;
+                    }
+                }
+                else if (!ancestor(selected.context, current)) {
+                    throw lockMismatch("one live workspace cannot represent incompatible scoped override contexts");
+                }
+            }
+        }
+        if (!changed)
+            return { policy, contexts };
+    }
+    throw lockMismatch("workspace override propagation resource limit exceeded");
+}
+/** Internal signal: restart pure planning before any fetch/publication mutation. */
+export class WorkspaceOverrideRestart extends Error {
+}
+export function refineWorkspaceOverride(contexts, key, incoming) {
+    const current = contexts.get(key);
+    if (current === incoming || ancestor(incoming, current))
+        return;
+    if (!ancestor(current, incoming))
+        throw lockMismatch("one live workspace cannot represent incompatible scoped override contexts");
+    contexts.set(key, incoming);
+    throw new WorkspaceOverrideRestart();
+}

package/dist/install/workspaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../src/install/workspaces.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG;IACpD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4EAA4E;IAC5E,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,0EAA0E;IAC1E,MAAM,EAAE;QAAE,IAAI,EAAE,gBAAgB,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9E,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AA2GF,kFAAkF;AAClF,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7D,OAAO,CAAC,gBAAgB,CAAC,CA4F3B;AACD,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,MAAM,CAAC;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EACL;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GACnC;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,WAAW,EAAE,iBAAiB,CAAA;KAAE,CAAC;CAC1D,CAAC;AACF,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,YAAY,EAAE,mBAAmB,EAAE,CAAC;CACrC,CAAC;AACF,8FAA8F;AAC9F,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,gBAAgB,GACxB,qBAAqB,EAAE,CAmFzB;AACD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,iBAAiB,EAAE,CAerB;AACD,0FAA0F;AAC1F,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,MAAM,EAAE,SAAS;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjD,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC;IAC9C,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C,GAAG,IAAI,CA+BP;AAED,sFAAsF;AACtF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,qBAAqB,EAAE,GACrC,MAAM,EAAE,CAoCV;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiC3E"}
+{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../src/install/workspaces.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG;IACpD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4EAA4E;IAC5E,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,0EAA0E;IAC1E,MAAM,EAAE;QAAE,IAAI,EAAE,gBAAgB,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9E,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AA2GF,kFAAkF;AAClF,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7D,OAAO,CAAC,gBAAgB,CAAC,CAgG3B;AACD,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,MAAM,CAAC;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EACL;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GACnC;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,WAAW,EAAE,iBAAiB,CAAA;KAAE,CAAC;CAC1D,CAAC;AACF,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,YAAY,EAAE,mBAAmB,EAAE,CAAC;CACrC,CAAC;AACF,8FAA8F;AAC9F,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,gBAAgB,GACxB,qBAAqB,EAAE,CAmFzB;AACD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,iBAAiB,EAAE,CAerB;AACD,0FAA0F;AAC1F,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,MAAM,EAAE,SAAS;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjD,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC;IAC9C,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C,GAAG,IAAI,CA+BP;AAED,sFAAsF;AACtF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,qBAAqB,EAAE,GACrC,MAAM,EAAE,CAoCV;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiC3E"}

package/dist/install/workspaces.js

@@ -164,7 +164,10 @@ export async function discoverWorkspaces(rootDirectory, options = {}) {
             member.id,
             member.manifest.name ?? null,
             member.manifest.version ?? null,
-            manifestFingerprint(member.manifest),
+            manifestFingerprint({
+                ...member.manifest,
+                overrides: member.id === "." ? member.manifest.overrides : undefined,
+            }),
         ]))),
     };
 }