zyrk 0.5.1 → 0.5.3

package/README.md

@@ -119,7 +119,7 @@ scheme, host, port, and path; redirects cannot expand that scope. Use
 Scoped registries route metadata, exact sources, imports and tool commands by
 the real package name, including aliases. Advisory requests are partitioned by
 registry; private names never fall back to a public endpoint. Disabled TLS
-verification is rejected before lookup. Git sources, non-workspace local sources, and overrides remain unsupported;
+verification is rejected before lookup. Git sources and non-workspace local sources remain unsupported;
 they fail explicitly. Optional dependencies incompatible with the selected platform
 are omitted; missing packages, integrity failures, and other optional failures
 remain errors. Platform selection is recorded in the lock. macOS, Windows, and
@@ -356,3 +356,14 @@ Keep existing data until an explicit migration is supported.
 
 [MIT](LICENSE). If you want to support development,
 [sponsor the maintainer](https://github.com/sponsors/kingjethro999).
+
+Root `package.json` dependency overrides support exact specifications, nested and
+version-qualified selectors, self rules (`.`), and `$direct` references. Direct
+dependency overrides must match the declared specification. Workspace member
+overrides are ignored, matching npm root-only policy. Override rule order is
+recorded in the manifest fingerprint; frozen installs reject policy drift.
+
+`zyrk help` and `zyrk --help` both show help successfully. Installs report
+preparation, resolution, verified source counts, realization, approved builds,
+and project linking on stderr. Interactive terminals show an activity spinner;
+redirected output contains plain phase messages. `--json` disables progress.

package/VERSION

@@ -1 +1 @@
-v0.5.1
+v0.5.3

package/dist/cli/main.d.ts

@@ -30,6 +30,7 @@ export type RunCliOptions = {
     };
     stderr: {
         write(chunk: string): unknown;
+        isTTY?: boolean;
     };
     readVersion?: () => string;
     cwd?: string;

package/dist/cli/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAe,SAAS,EAAe,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,CAAC;AACrB,OAAO,EAAoB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAExE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAM3C,OAAO,EAAqC,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEhF,eAAO,MAAM,uBAAuB,IAAI,CAAC;AA2DzC,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAwBhD;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6EF;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,GACnD,SAAS,CAgDX;AAmBD,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,eAAe,CAAC,CAAC;CACxC,CAAC;AAEF,gFAAgF;AAChF,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAqZpE"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAe,SAAS,EAAe,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,CAAC;AACrB,OAAO,EAAoB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAExE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAM3C,OAAO,EAAqC,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEhF,eAAO,MAAM,uBAAuB,IAAI,CAAC;AA2DzC,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAwBhD;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6EF;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;CAAE,GACnD,SAAS,CAgDX;AAmBD,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAC3D,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,eAAe,CAAC,CAAC;CACxC,CAAC;AAEF,gFAAgF;AAChF,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CA4ZpE"}

package/dist/cli/main.js

@@ -1,3 +1,4 @@
+import { createInstallProgress } from "./progress.js";
 import { runMaintenanceCommand } from "../commands/maintenance.js";
 import { runDeployCommand } from "../commands/deploy.js";
 import { runPatchCommand } from "../commands/patch.js";
@@ -379,6 +380,7 @@ export async function runCli(options) {
         (parsed.command === "install" || parsed.command === "i")) {
         if (isGlobalInstallRequest(parsed.command, parsed.commandArgs, options.env))
             return emit(fail(globalInstallError(parsed.command), parsed));
+        const progress = createInstallProgress(options.stderr, parsed.json);
         try {
             if (parsed.commandArgs.includes("--help") ||
                 parsed.commandArgs.includes("-h")) {
@@ -413,6 +415,7 @@ export async function runCli(options) {
                 else
                     specs.push(token);
             }
+            progress.update({ phase: "planning" });
             const cwd = options.cwd ?? process.cwd();
             const tools = options.tools
                 ? await options.tools()
@@ -429,12 +432,14 @@ export async function runCli(options) {
                     }),
                 };
             const result = await installProject({
+                onProgress: progress.update,
                 ...flags,
                 env: options.env,
                 specs,
                 projectDir: cwd,
                 ...tools,
             });
+            progress.close();
             if (parsed.json)
                 return emit({
                     exitCode: 0,
@@ -451,8 +456,12 @@ export async function runCli(options) {
             });
         }
         catch (error) {
+            progress.close();
             return emit(fail(toZyrkError(error, "zyrk install failed."), parsed));
         }
+        finally {
+            progress.close();
+        }
     }
     if (!parsed.help &&
         !parsed.version &&

package/dist/cli/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/cli/parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,+DAA+D;IAC/D,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,6EAA6E;IAC7E,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,wEAAwE;IACxE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAkD7D;AAKD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,SAAS,MAAM,EAAE,EAC9B,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAOT"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/cli/parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,+DAA+D;IAC/D,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,6EAA6E;IAC7E,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,wEAAwE;IACxE,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAmD7D;AAKD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,SAAS,MAAM,EAAE,EAC9B,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAOT"}

package/dist/cli/parse.js

@@ -45,6 +45,8 @@ export function parseArgs(argv) {
         }
         if (parsed.command === undefined && !token.startsWith("-")) {
             parsed.command = token;
+            if (token === "help")
+                parsed.help = true;
             commandIndex = index;
             return;
         }

package/dist/cli/progress.d.ts

@@ -0,0 +1,10 @@
+import type { InstallProgress } from "../install/run.ts";
+/** Presentation only: never writes to stdout or exposes package URLs or paths. */
+export declare function createInstallProgress(stream: {
+    write(chunk: string): unknown;
+    isTTY?: boolean;
+}, quiet: boolean): {
+    update(event: InstallProgress): void;
+    close(): void;
+};
+//# sourceMappingURL=progress.d.ts.map

package/dist/cli/progress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAWzD,kFAAkF;AAClF,wBAAgB,qBAAqB,CACnC,MAAM,EAAE;IAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1D,KAAK,EAAE,OAAO,GACb;IAAE,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IAAC,KAAK,IAAI,IAAI,CAAA;CAAE,CAuCzD"}

package/dist/cli/progress.js

@@ -0,0 +1,52 @@
+const labels = {
+    planning: "Preparing installation",
+    resolving: "Resolving dependencies",
+    fetching: "Verifying package sources",
+    realizing: "Preparing shared realizations",
+    building: "Preparing approved private builds",
+    linking: "Linking project dependencies",
+};
+/** Presentation only: never writes to stdout or exposes package URLs or paths. */
+export function createInstallProgress(stream, quiet) {
+    let timer;
+    let current = "", last = "", frame = 0, closed = false;
+    const write = (text) => {
+        try {
+            stream.write(text);
+        }
+        catch {
+            /* A display failure cannot alter installation. */
+        }
+    };
+    const render = () => write(`\r\u001b[2K${["|", "/", "-", "\\"][frame++ % 4]} ${current}`);
+    return {
+        update(event) {
+            if (quiet || closed)
+                return;
+            current =
+                labels[event.phase] +
+                    (event.total === undefined
+                        ? ""
+                        : ` (${event.completed ?? 0}/${event.total})`);
+            if (stream.isTTY) {
+                render();
+                if (!timer) {
+                    timer = setInterval(render, 100);
+                    timer.unref();
+                }
+            }
+            else if (current !== last)
+                write(`zyrk: ${current}\n`);
+            last = current;
+        },
+        close() {
+            if (closed)
+                return;
+            closed = true;
+            if (timer)
+                clearInterval(timer);
+            if (!quiet && stream.isTTY && current)
+                write("\r\u001b[2K");
+        },
+    };
+}

package/dist/install/import-npm-workspace.d.ts

@@ -1,5 +1,6 @@
 import type { NpmLockDoc } from "../lockfile/types.ts";
 import type { WorkspaceProject } from "./workspaces.ts";
 import type { WorkspaceGraph } from "./workspace-graph.ts";
+/** Import stays pure while live-node scope refinement converges. */
 export declare function importNpmWorkspaceLock(doc: NpmLockDoc, project: WorkspaceProject, origin: string | ((name: string) => string)): WorkspaceGraph;
 //# sourceMappingURL=import-npm-workspace.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"import-npm-workspace.d.ts","sourceRoot":"","sources":["../../src/install/import-npm-workspace.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAQvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,sBAAsB,CAAC;AAE9B,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,GAC1C,cAAc,CAyThB"}
+{"version":3,"file":"import-npm-workspace.d.ts","sourceRoot":"","sources":["../../src/install/import-npm-workspace.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAQvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,sBAAsB,CAAC;AA0V9B,oEAAoE;AACpE,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,GAC1C,cAAc,CAWhB"}

package/dist/install/import-npm-workspace.js

@@ -1,5 +1,6 @@
 /** Translate npm's physical virtual tree without selecting new registry versions. */
 import * as path from "node:path";
+import { workspaceOverrides, refineWorkspaceOverride, WorkspaceOverrideRestart, } from "./workspace-overrides.js";
 import { satisfies } from "semver";
 import { validateLockDoc } from "../lockfile/read.js";
 import { sha512Hex } from "../util/hash.js";
@@ -8,7 +9,7 @@ import { importNpmLock } from "./import-npm.js";
 import { lockMismatch, cleanUrl } from "./lock.js";
 import { ZyrkError } from "../errors.js";
 import { assertWorkspacePlatform } from "./workspace-graph.js";
-export function importNpmWorkspaceLock(doc, project, origin) {
+function importNpmWorkspaceLockPass(doc, project, origin, overrideState) {
     if (!doc ||
         typeof doc !== "object" ||
         Array.isArray(doc) ||
@@ -65,6 +66,8 @@ export function importNpmWorkspaceLock(doc, project, origin) {
         (typeof origin === "string" && !cleanUrl(origin)))
         throw lockMismatch("workspace adoption needs an unannotated npm v2/v3 lock");
     const packages = doc.packages;
+    const overrides = overrideState.policy;
+    const contexts = new Map(overrideState.contexts);
     const graph = { nodes: [], importers: {}, omissions: [] };
     const locations = new Map();
     const local = new Map(project.importers.map((i) => [i.id === "." ? "" : i.id, i]));
@@ -131,7 +134,10 @@ export function importNpmWorkspaceLock(doc, project, origin) {
         }
     };
     const populated = new Set();
-    const load = (location, name, spec, from) => {
+    const load = (location, name, spec, from, parentContext) => {
+        const selectedOverride = overrides.select(parentContext, name, spec);
+        spec = selectedOverride.spec;
+        const contextKey = `${location}\0${selectedOverride.context.id}`;
         const entry = packages[location];
         if (entry.link === true) {
             const target = locations.get(entry.resolved);
@@ -143,6 +149,7 @@ export function importNpmWorkspaceLock(doc, project, origin) {
                     (!["*", "^", "~"].includes(range) &&
                         !satisfies(target.version, range)))
                 throw lockMismatch("npm workspace link disagrees with requirement");
+            refineWorkspaceOverride(overrideState.contexts, target.key, selectedOverride.context);
             return target;
         }
         // Reuse the strict single-selection adapter's archive, alias, source and
@@ -155,12 +162,12 @@ export function importNpmWorkspaceLock(doc, project, origin) {
             lockfileVersion: 3,
             packages: { "": {}, [`node_modules/${name}`]: shallow },
         }, { [name]: spec }, origin).nodes[0];
-        let node = locations.get(location);
+        let node = locations.get(contextKey);
         if (!node) {
             const { peerBindings: _bindings, ...source } = selected;
             node = {
                 ...source,
-                key: `${selected.name}@${selected.version}#${sha512Hex(location).slice(0, 16)}`,
+                key: `${selected.name}@${selected.version}#${sha512Hex(selectedOverride.context.id ? contextKey : location).slice(0, 16)}`,
                 kind: "registry",
                 edges: [],
                 peers: {},
@@ -168,25 +175,26 @@ export function importNpmWorkspaceLock(doc, project, origin) {
             };
             assertWorkspacePlatform({ nodes: [node], importers: {}, omissions: [] });
             graph.nodes.push(node);
-            locations.set(location, node);
+            locations.set(contextKey, node);
+            contexts.set(node.key, selectedOverride.context);
         }
         try {
             populate(location, node);
         }
         catch (cause) {
-            populated.delete(location);
-            locations.delete(location);
+            populated.delete(node.key);
+            locations.delete(contextKey);
             graph.nodes = graph.nodes.filter((n) => n !== node);
             throw cause;
         }
         return node;
     };
     const populate = (location, node) => {
-        if (populated.has(location))
+        if (populated.has(node.key))
             return;
         if (populated.size >= 10000)
             throw lockMismatch("npm import resource limit exceeded");
-        populated.add(location);
+        populated.add(node.key);
         const entry = packages[location];
         const requirements = new Map();
         for (const [field, kind] of [
@@ -227,7 +235,7 @@ export function importNpmWorkspaceLock(doc, project, origin) {
             }
             let target;
             try {
-                target = load(targetLocation, name, requirement.spec, location);
+                target = load(targetLocation, name, requirement.spec, location, contexts.get(node.key));
             }
             catch (cause) {
                 if (requirement.kind === "optional" &&
@@ -259,7 +267,7 @@ export function importNpmWorkspaceLock(doc, project, origin) {
                 node.peers[name] = null;
                 continue;
             }
-            const target = load(targetLocation, name, spec, location);
+            const target = load(targetLocation, name, spec, location, contexts.get(node.key));
             node.peers[name] = target.key;
             if (!node.edges.some((edge) => edge.name === name))
                 node.edges.push({ name, target: target.key, kind: "peer", spec });
@@ -281,3 +289,17 @@ export function importNpmWorkspaceLock(doc, project, origin) {
     graph.nodes.sort((a, b) => a.key.localeCompare(b.key));
     return graph;
 }
+/** Import stays pure while live-node scope refinement converges. */
+export function importNpmWorkspaceLock(doc, project, origin) {
+    const state = workspaceOverrides(project), expires = Date.now() + 30000;
+    for (let round = 0; round < 128 && Date.now() < expires; round++) {
+        try {
+            return importNpmWorkspaceLockPass(doc, project, origin, state);
+        }
+        catch (cause) {
+            if (!(cause instanceof WorkspaceOverrideRestart))
+                throw cause;
+        }
+    }
+    throw lockMismatch("npm workspace override import resource limit exceeded");
+}

package/dist/install/import-npm.d.ts

@@ -1,4 +1,6 @@
+/** Adopt npm v2/v3 exact selections without asking the registry to pick versions. */
+import { type OverridePolicy } from "../resolve/overrides.ts";
 import type { NpmLockDoc } from "../lockfile/types.ts";
 import type { FinalizedGraph } from "../resolve/resolver.ts";
-export declare function importNpmLock(doc: NpmLockDoc, requirements: Record<string, string>, origin: string | ((name: string) => string)): FinalizedGraph;
+export declare function importNpmLock(doc: NpmLockDoc, requirements: Record<string, string>, origin: string | ((name: string) => string), overrides?: OverridePolicy): FinalizedGraph;
 //# sourceMappingURL=import-npm.d.ts.map

package/dist/install/import-npm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-npm.d.ts","sourceRoot":"","sources":["../../src/install/import-npm.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,wBAAwB,CAAC;AAKhC,wBAAgB,aAAa,CAC3B,GAAG,EAAE,UAAU,EACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,GAC1C,cAAc,CA4KhB"}
+{"version":3,"file":"import-npm.d.ts","sourceRoot":"","sources":["../../src/install/import-npm.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,wBAAwB,CAAC;AAKhC,wBAAgB,aAAa,CAC3B,GAAG,EAAE,UAAU,EACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,EAC3C,SAAS,GAAE,cAAwC,GAClD,cAAc,CAqLhB"}

package/dist/install/import-npm.js

@@ -1,11 +1,12 @@
 /** Adopt npm v2/v3 exact selections without asking the registry to pick versions. */
+import { createRootOverrides, } from "../resolve/overrides.js";
 import { validateLockDoc } from "../lockfile/read.js";
 import { canonicalStrongSri } from "../util/integrity.js";
 import { valid, satisfies } from "semver";
 import { parseRequirement } from "../resolve/spec.js";
 import { sourceIdOf, sha512Hex } from "../util/hash.js";
 import { cleanUrl, lockMismatch, packageName } from "./lock.js";
-export function importNpmLock(doc, requirements, origin) {
+export function importNpmLock(doc, requirements, origin, overrides = createRootOverrides({})) {
     validateLockDoc(doc, "package-lock.json");
     const packages = doc.packages;
     if (!packages || !packages[""])
@@ -26,8 +27,11 @@ export function importNpmLock(doc, requirements, origin) {
                 : "";
         }
     };
-    const load = (location, edgeName, spec) => {
-        const existing = locations.get(location);
+    const load = (location, edgeName, spec, parentContext) => {
+        const selected = overrides.select(parentContext, edgeName, spec);
+        spec = selected.spec;
+        const contextKey = `${location}\0${selected.context.id}`;
+        const existing = locations.get(contextKey);
         const entry = packages[location];
         if (!entry || entry.link === true || entry.inBundle === true)
             throw lockMismatch("npm lock contains an unsupported linked or bundled selection");
@@ -53,7 +57,7 @@ export function importNpmLock(doc, requirements, origin) {
         if (existing)
             return existing;
         const node = {
-            key: `${name}@${entry.version}#${sha512Hex(location).slice(0, 16)}`,
+            key: `${name}@${entry.version}#${sha512Hex(selected.context.id ? contextKey : location).slice(0, 16)}`,
             name,
             version: entry.version,
             origin: selectedOrigin,
@@ -96,7 +100,7 @@ export function importNpmLock(doc, requirements, origin) {
                 node.platform[field] = value;
             }
         }
-        locations.set(location, node);
+        locations.set(contextKey, node);
         const dependencies = Object.create(null);
         for (const [group, kind] of [
             ["dependencies", "prod"],
@@ -128,7 +132,7 @@ export function importNpmLock(doc, requirements, origin) {
                 }
                 throw lockMismatch("npm lock is missing a required dependency");
             }
-            const target = load(targetLocation, dep, requirement.spec);
+            const target = load(targetLocation, dep, requirement.spec, selected.context);
             node.edges.push({
                 name: dep,
                 target: target.key,
@@ -148,7 +152,7 @@ export function importNpmLock(doc, requirements, origin) {
         const location = find("", name);
         if (!location)
             throw lockMismatch("npm lock is missing a direct selection");
-        return { name, target: load(location, name, spec).key };
+        return { name, target: load(location, name, spec, overrides.root).key };
     });
     return {
         nodes: [...locations.values()].sort((a, b) => a.key.localeCompare(b.key)),

package/dist/install/run.d.ts

@@ -1,7 +1,13 @@
 import { type BuildCandidate } from "./private.ts";
 import { RegistryClient } from "../fetch/registry.ts";
 import { Store } from "../store/layout.ts";
+export type InstallProgress = {
+    phase: "planning" | "resolving" | "fetching" | "realizing" | "building" | "linking";
+    completed?: number;
+    total?: number;
+};
 export type InstallOptions = {
+    onProgress?: (event: InstallProgress) => void;
     projectDir: string;
     store: Store;
     registry: RegistryClient;

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,CAsxBxB"}
+{"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,eAAe,GAAG;IAC5B,KAAK,EACD,UAAU,GACV,WAAW,GACX,UAAU,GACV,WAAW,GACX,UAAU,GACV,SAAS,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC9C,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,CA8zBxB"}

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)) ||
@@ -93,11 +93,19 @@ function scriptPolicy(manifest) {
     return object(manifest.zyrk) ? manifest.zyrk.scripts : undefined;
 }
 export async function installProject(options) {
+    options.onProgress?.({ phase: "planning" });
     if (await findWorkspaceRoot(options.projectDir)) {
         const { installWorkspaceProject } = await import("./workspace-install.js");
         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 +197,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);
@@ -215,7 +224,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, (name) => options.registry.originFor(name));
+            resolved = importNpmLock(existing, allDeps, (name) => options.registry.originFor(name), overrides);
         }
         if (existing?.zyrk &&
             specs.length === 0 &&
@@ -240,7 +249,9 @@ export async function installProject(options) {
                 throw error("ZYRK_OFFLINE_MISSING", "Offline installation requires an existing compatible zyrk lockfile.");
             const prior = existing?.zyrk ? lockedGraph(existing) : undefined;
             const fresh = new Set(specs.map((spec) => npa(spec).name));
+            options.onProgress?.({ phase: "resolving" });
             resolved = await resolveRequirements({
+                overrides,
                 provider: {
                     origin: options.registry.origin,
                     originFor: (name) => options.registry.originFor(name),
@@ -451,10 +462,21 @@ export async function installProject(options) {
             })
             : undefined;
         const unique = new Map(activeNodes.map((n) => [n.sourceId, n]));
+        let completedSources = 0;
+        options.onProgress?.({
+            phase: "fetching",
+            completed: 0,
+            total: unique.size,
+        });
         for (const node of unique.values()) {
             operation.operation.checkpoint();
             if (await pathExists(sourceManifestPath(options.store, node.sourceId))) {
                 await readSourceManifest(options.store, node.sourceId);
+                options.onProgress?.({
+                    phase: "fetching",
+                    completed: ++completedSources,
+                    total: unique.size,
+                });
                 continue;
             }
             if (options.offline)
@@ -488,6 +510,11 @@ export async function installProject(options) {
             if (source.sourceId !== node.sourceId)
                 throw lockMismatch("download identity disagrees with the locked source");
             await rm(tarball, { force: true });
+            options.onProgress?.({
+                phase: "fetching",
+                completed: ++completedSources,
+                total: unique.size,
+            });
         }
         for (const node of unique.values())
             assertSupportedSourcePayload(node, await readSourceManifest(options.store, node.sourceId));
@@ -500,6 +527,7 @@ export async function installProject(options) {
                 warnings,
             };
         const graph = createGraphDoc(activeNodes.map((n) => ({ ...n, deps: n.edges })));
+        options.onProgress?.({ phase: "realizing" });
         const sharedRealized = await realizeGraph({
             store: options.store,
             graph,
@@ -572,6 +600,7 @@ export async function installProject(options) {
                 });
                 privateGraph = true;
             }
+            options.onProgress?.({ phase: "building" });
             await buildPrivate({
                 project,
                 generationId,
@@ -658,6 +687,7 @@ export async function installProject(options) {
             roots: selectedRoots.map((r) => r.target),
             readiness,
         });
+        options.onProgress?.({ phase: "linking" });
         const published = await installProjection(project, entries, {
             generationId,
             lockHeld: true,

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":"AAOA,OAAO,KAAK,EACV,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,MAAM,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;IACrC,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,QAAQ,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;IACrC,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AACvE,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC;CACxE,CAAC;AAYF,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE;IACP,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5B,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB,GACL,OAAO,CAAC,cAAc,CAAC,CAoWzB;AACD,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,cAAc,GACpB,kBAAkB,EAAE,CAetB;AAED,uGAAuG;AACvG,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,MAAM,CAgCR;AAED,oFAAoF;AACpF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAsCnE"}
+{"version":3,"file":"workspace-graph.d.ts","sourceRoot":"","sources":["../../src/install/workspace-graph.ts"],"names":[],"mappings":"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"}