@westbayberry/dg 2.1.0 → 2.3.0

package/dist/launcher/manifest-screen.js

@@ -0,0 +1,171 @@
+import { existsSync, readFileSync, statSync } from "node:fs";
+import { isAbsolute, join } from "node:path";
+// A bare `npm install` resolves the whole dependency tree, but enumerating every
+// transitive package in the hook would blow its time budget — that breadth is
+// the runtime network gate's job. The static hook screens the DIRECT
+// dependencies declared in the manifest, which is where a cloned hostile repo
+// plants a malicious package, and caps the count so a giant manifest defers
+// instead of silently passing.
+const MAX_MANIFEST_SPECS = 100;
+const MAX_MANIFEST_BYTES = 4 * 1024 * 1024;
+function readBoundedFile(path) {
+    try {
+        if (statSync(path).size > MAX_MANIFEST_BYTES) {
+            return null;
+        }
+        return readFileSync(path, "utf8");
+    }
+    catch {
+        return null;
+    }
+}
+function asRecord(value) {
+    return typeof value === "object" && value !== null ? value : {};
+}
+// package-lock v2/v3 keys direct deps as "node_modules/<name>"; v1 nests them
+// under `dependencies`. Either way, pinning to the lock means the version we
+// screen is the version that installs.
+function lockfileVersions(cwd) {
+    const out = new Map();
+    for (const file of ["package-lock.json", "npm-shrinkwrap.json"]) {
+        const raw = readBoundedFile(join(cwd, file));
+        if (!raw) {
+            continue;
+        }
+        try {
+            const parsed = JSON.parse(raw);
+            const packages = asRecord(parsed.packages);
+            for (const [key, meta] of Object.entries(packages)) {
+                if (key.startsWith("node_modules/")) {
+                    const version = asRecord(meta).version;
+                    if (typeof version === "string") {
+                        out.set(key.slice("node_modules/".length), version);
+                    }
+                }
+            }
+            const deps = asRecord(parsed.dependencies);
+            for (const [name, meta] of Object.entries(deps)) {
+                const version = asRecord(meta).version;
+                if (typeof version === "string" && !out.has(name)) {
+                    out.set(name, version);
+                }
+            }
+        }
+        catch {
+            // Unparsable lockfile: fall back to range resolution, don't crash.
+        }
+        if (out.size > 0) {
+            break;
+        }
+    }
+    return out;
+}
+export function readNpmManifestSpecs(cwd) {
+    const raw = readBoundedFile(join(cwd, "package.json"));
+    if (!raw) {
+        return null;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+    const names = [];
+    const seen = new Set();
+    for (const field of ["dependencies", "devDependencies", "optionalDependencies"]) {
+        for (const name of Object.keys(asRecord(parsed[field]))) {
+            if (!seen.has(name)) {
+                seen.add(name);
+                names.push(name);
+            }
+        }
+    }
+    if (names.length === 0) {
+        return null;
+    }
+    const truncated = names.length > MAX_MANIFEST_SPECS;
+    const locks = lockfileVersions(cwd);
+    const specs = names.slice(0, MAX_MANIFEST_SPECS).map((name) => ({ name, version: locks.get(name) ?? null }));
+    return { specs, truncated };
+}
+function parseRequirementLine(line) {
+    const stripped = line.split(/(?<!\\)#/)[0]?.trim() ?? "";
+    if (stripped.length === 0 || stripped.startsWith("-")) {
+        return null;
+    }
+    // Drop environment markers (`; python_version < "3.9"`) and inline options.
+    const core = (stripped.split(";")[0] ?? "").trim();
+    if (core.length === 0 || core.includes("://") || core.startsWith("git+")) {
+        return null;
+    }
+    const exact = /^([A-Za-z0-9._-]+)(?:\[[^\]]*\])?==([^,;\s]+)$/.exec(core);
+    if (exact && exact[1] && exact[2]) {
+        return { name: exact[1], version: exact[2] };
+    }
+    const ranged = /^([A-Za-z0-9._-]+)(?:\[[^\]]*\])?\s*(?:===|>=|<=|~=|!=|<|>|$)/.exec(core);
+    if (ranged && ranged[1]) {
+        return { name: ranged[1], version: null };
+    }
+    return null;
+}
+export function readPipRequirementSpecs(args, cwd) {
+    const files = [];
+    for (let i = 0; i < args.length; i += 1) {
+        const a = args[i];
+        if (a === undefined) {
+            continue;
+        }
+        if (a === "-r" || a === "--requirement") {
+            const v = args[i + 1];
+            i += 1;
+            if (v !== undefined) {
+                files.push(v);
+            }
+        }
+        else if (a.startsWith("--requirement=")) {
+            files.push(a.slice("--requirement=".length));
+        }
+        else if (a.startsWith("-r=")) {
+            files.push(a.slice("-r=".length));
+        }
+    }
+    if (files.length === 0) {
+        return null;
+    }
+    const specs = [];
+    const seen = new Set();
+    let truncated = false;
+    for (const file of files) {
+        const path = isAbsolute(file) ? file : join(cwd, file);
+        if (!existsSync(path)) {
+            // A missing requirements file means the install will fail anyway — nothing
+            // to screen, and no reason to nag the user. Leave it alone.
+            continue;
+        }
+        const raw = readBoundedFile(path);
+        if (!raw) {
+            // The file exists but we could not read it (oversized / permissions) — that
+            // is a real unscreened install, so defer rather than pass it clean.
+            truncated = true;
+            continue;
+        }
+        for (const line of raw.split(/\r?\n/)) {
+            const spec = parseRequirementLine(line);
+            if (!spec || seen.has(spec.name)) {
+                continue;
+            }
+            if (specs.length >= MAX_MANIFEST_SPECS) {
+                truncated = true;
+                break;
+            }
+            seen.add(spec.name);
+            specs.push(spec);
+        }
+    }
+    if (specs.length === 0) {
+        return truncated ? { specs, truncated } : null;
+    }
+    return { specs, truncated };
+}

package/dist/launcher/output-redaction.js

@@ -1,23 +1,29 @@
 const credentialUrlPattern = /\b([a-z][a-z0-9+.-]{0,31}:\/\/)([^/\s:@]+):([^/\s@]+)@/gi;
 const authHeaderPattern = /\b(proxy-authorization|authorization):\s*[^\r\n]+/gi;
-const tokenAssignmentPattern = /(?<![A-Za-z0-9])([A-Za-z0-9_-]*(?:secret[_-]key|access[_-]key|api[_-]key|token|password|secret))=([^\s]+)/gi;
+// Matches both KEY=value and colon-form (KEY: value, YAML) secret assignments;
+// the separator and any opening quote are preserved in the replacement.
+const tokenAssignmentPattern = /(?<![A-Za-z0-9])([A-Za-z0-9_-]*(?:secret[_-]key|access[_-]key|api[_-]key|token|password|secret))(\s*[:=]\s*)("?)([^\s"]+)/gi;
 const npmrcAuthPattern = /(_authToken|_auth|_password)\s*=\s*("[^"]*"|[^\s;,]+)/gi;
 const jsonSecretPattern = /("[A-Za-z0-9_.$-]*(?:secret[_-]key|access[_-]key|api[_-]key|token|password|secret)"\s*:\s*)"(?:[^"\\]|\\.)*"/gi;
 const bearerPattern = /\bBearer\s+[A-Za-z0-9._~+/=-]{8,}/g;
-const knownTokenShapePattern = /\b(npm_[A-Za-z0-9]{36}|gh[pousr]_[A-Za-z0-9]{36,255}|pypi-[A-Za-z0-9_-]{20,}|glpat-[A-Za-z0-9_-]{20,}|xox[bp]-[A-Za-z0-9-]{10,})\b/g;
+// Bare tokens (not in URL userinfo or KEY=value form), by their published shape.
+// Alnum-only look-around instead of \b so a fixed-length token immediately
+// adjacent to an underscore-word (e.g. npm_<36>_ci) is still redacted — \b fails
+// there because the boundary would fall between two word characters.
+const knownTokenShapePattern = /(?<![A-Za-z0-9])(npm_[A-Za-z0-9]{36}|gh[pousr]_[A-Za-z0-9]{36,255}|github_pat_[A-Za-z0-9_]{22,255}|pypi-[A-Za-z0-9_-]{20,}|glpat-[A-Za-z0-9_-]{20,}|hf_[A-Za-z0-9]{30,}|AKIA[0-9A-Z]{16}|ASIA[0-9A-Z]{16}|AIza[0-9A-Za-z_-]{35}|sk_(?:live|test)_[A-Za-z0-9]{20,}|rk_live_[A-Za-z0-9]{20,}|sk-(?:proj-)?[A-Za-z0-9_-]{20,}|xox[abdeprs]-[A-Za-z0-9-]{10,})(?![A-Za-z0-9])/g;
 export function redactSecrets(text) {
     return text
         .replace(credentialUrlPattern, "$1<redacted>@")
         .replace(authHeaderPattern, (_match, header) => `${header}: <redacted>`)
         .replace(npmrcAuthPattern, "$1=<redacted>")
         .replace(jsonSecretPattern, '$1"<redacted>"')
-        .replace(tokenAssignmentPattern, "$1=<redacted>")
+        .replace(tokenAssignmentPattern, "$1$2$3<redacted>")
         .replace(bearerPattern, "Bearer <redacted>")
         .replace(knownTokenShapePattern, "<redacted>");
 }
 const STREAM_FLUSH_QUIET_MS = 80;
 const SECRET_TAIL_SCAN_CHARS = 80;
-const secretTailPattern = /(Bearer\s+[\w.~+/=-]*|npm_[A-Za-z0-9]*|gh[pousr]_[A-Za-z0-9]*|pypi-[\w-]*|glpat-[\w-]*|xox[bp]-[\w-]*|[\w-]*(?:_authToken|_auth|_password|secret[_-]key|access[_-]key|api[_-]key|token|password|secret)=\S*|"[\w.$-]*(?:secret[_-]key|access[_-]key|api[_-]key|token|password|secret)"\s*:\s*"?[^"\n]*)$/i;
+const secretTailPattern = /(Bearer\s+[\w.~+/=-]*|npm_[A-Za-z0-9]*|gh[pousr]_[A-Za-z0-9]*|github_pat_[A-Za-z0-9_]*|pypi-[\w-]*|glpat-[\w-]*|hf_[A-Za-z0-9]*|AKIA[0-9A-Z]*|ASIA[0-9A-Z]*|AIza[\w-]*|sk_(?:live|test)_[A-Za-z0-9]*|rk_live_[A-Za-z0-9]*|sk-(?:proj-)?[\w-]*|xox[abdeprs]-[\w-]*|[\w-]*(?:_authToken|_auth|_password|secret[_-]key|access[_-]key|api[_-]key|token|password|secret)\s*[:=]\s*"?\S*|"[\w.$-]*(?:secret[_-]key|access[_-]key|api[_-]key|token|password|secret)"\s*:\s*"?[^"\n]*)$/i;
 export function createStreamRedactor(emit) {
     let pending = "";
     let timer;

package/dist/launcher/preflight-prompt.js

@@ -4,11 +4,13 @@ import { matchDecision } from "../decisions/apply.js";
 import { offerRememberOnIo } from "../decisions/remember-prompt.js";
 import { renderInstallDecision } from "../install-ui/block-render.js";
 import { defaultPromptIo } from "../install-ui/prompt.js";
+import { normalizePypiName } from "../policy/pypi-name.js";
 import { resolveAcceptedBy } from "../project/dgfile.js";
 import { enforceProtectedInstall } from "../proxy/enforcement.js";
-import { classifyPackageManagerInvocation, isSupportedPackageManager } from "./classify.js";
+import { classifyPackageManagerInvocation, isSupportedPackageManager, normalizeManagerName } from "./classify.js";
 import { actionRank, promptPreflightYesNo, recordPreflightApprovals, renderCoveredWarns, renderProvenanceDowngrades, resolvePreflightDecisions } from "./install-preflight.js";
 import { redactSecrets } from "./output-redaction.js";
+import { startPrepSpinner } from "../install-ui/prep-spinner.js";
 const ECOSYSTEM_BY_MANAGER = {
     npm: "npm",
     pnpm: "npm",
@@ -24,8 +26,9 @@ export async function maybePreflightInstallPrompt(args, options = {}) {
     if (!io.isTTY || isCiEnv(env)) {
         return FALL_THROUGH;
     }
-    const [manager, ...rest] = args;
-    if (!manager || !isSupportedPackageManager(manager)) {
+    const [rawManager, ...rest] = args;
+    const manager = normalizeManagerName(rawManager ?? "");
+    if (!rawManager || !isSupportedPackageManager(manager)) {
         return FALL_THROUGH;
     }
     const ecosystem = ECOSYSTEM_BY_MANAGER[manager];
@@ -44,11 +47,13 @@ export async function maybePreflightInstallPrompt(args, options = {}) {
     const decisions = options.decisionsCwd ? resolvePreflightDecisions(ecosystem, options.decisionsCwd, env) : null;
     const flagged = [];
     const covered = [];
+    const spinner = startPrepSpinner("DG preparing…");
     try {
         const response = await (options.analyze ?? analyzePackages)(specs.map((spec) => ({ name: spec.name, version: spec.version })), { ecosystem, env });
+        spinner.stop();
         renderProvenanceDowngrades(response.packages, io.output);
         for (const spec of specs) {
-            const pkg = response.packages.find((entry) => entry.name === spec.name && entry.version === spec.version);
+            const pkg = response.packages.find((entry) => sameSpecName(entry.name, spec.name, ecosystem) && entry.version === spec.version);
             const action = pkg?.action ?? "pass";
             if (action === "pass") {
                 continue;
@@ -68,6 +73,9 @@ export async function maybePreflightInstallPrompt(args, options = {}) {
     catch {
         return FALL_THROUGH;
     }
+    finally {
+        spinner.stop();
+    }
     if (covered.length > 0) {
         renderCoveredWarns(covered, decisions, io.output);
         recordPreflightApprovals(covered.map((pkg) => ({ name: pkg.name, version: pkg.version, action: "warn" })));
@@ -131,6 +139,12 @@ export async function maybePreflightInstallPrompt(args, options = {}) {
         result: { exitCode: 1, stdout: "", stderr: "Declined. Nothing was installed.\n" }
     };
 }
+function sameSpecName(entryName, specName, ecosystem) {
+    if (ecosystem === "pypi") {
+        return normalizePypiName(entryName) === normalizePypiName(specName);
+    }
+    return entryName === specName;
+}
 function asFlaggedPackage(entry) {
     return {
         name: entry.spec.name,