@westbayberry/dg 1.1.0 → 1.1.3

package/dist/postinstall.mjs

@@ -4,7 +4,8 @@ import { homedir as homedir7, userInfo } from "node:os";
 
 // src/shims/install.ts
 import { homedir as homedir5 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join4, dirname as dirname2 } from "node:path";
+import { fileURLToPath } from "node:url";
 import { chmodSync, chownSync, existsSync as existsSync4, readdirSync, readFileSync as readFileSync3, statSync as statSync2, appendFileSync as appendFileSync2, writeFileSync as writeFileSync3 } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { randomBytes } from "node:crypto";
@@ -119,9 +120,23 @@ if [ -n "\${DG_SHIM_ACTIVE:-}" ]; then
   echo "dg: real __ECOSYSTEM__ not found on PATH" >&2
   exit 127
 fi
-DG_SHIM_ACTIVE="$(cat "$HOME/.dg/state/shim-nonce" 2>/dev/null)" \\
-DG_SHIM_PARENT_PATH="$PATH" \\
-exec dg __wrap __ECOSYSTEM__ "$@"
+nonce=$(cat "$HOME/.dg/state/shim-nonce" 2>/dev/null)
+dg_entry=$(cat "$HOME/.dg/state/dg-entry" 2>/dev/null)
+if [ -n "$dg_entry" ] && [ -x "$dg_entry" ]; then
+  DG_SHIM_ACTIVE="$nonce" DG_SHIM_PARENT_PATH="$PATH" exec "$dg_entry" __wrap __ECOSYSTEM__ "$@"
+fi
+cleaned_path=$(printf '%s' "$PATH" | awk -v RS=':' -v ORS=':' '$0 != ENVIRON["HOME"]"/.dg/shims"' | sed 's/:$//')
+dg_bin=$(PATH="$cleaned_path" command -v dg)
+if [ -n "$dg_bin" ]; then
+  DG_SHIM_ACTIVE="$nonce" DG_SHIM_PARENT_PATH="$PATH" exec "$dg_bin" __wrap __ECOSYSTEM__ "$@"
+fi
+real_bin=$(PATH="$cleaned_path" command -v __ECOSYSTEM__)
+if [ -n "$real_bin" ]; then
+  printf '%s dg unresolved; passthrough __ECOSYSTEM__\\n' "$(date -u +%Y-%m-%dT%H:%M:%SZ 2>/dev/null)" >> "$HOME/.dg/state/bypass.log" 2>/dev/null
+  exec "$real_bin" "$@"
+fi
+echo "dg: neither dg nor real __ECOSYSTEM__ found on PATH" >&2
+exit 127
 `;
 var WINDOWS_SHIM_BODY = `@echo off
 setlocal enabledelayedexpansion
@@ -139,13 +154,41 @@ if not "%DG_SHIM_ACTIVE%"=="" (
   echo dg: real __ECOSYSTEM__ not found on PATH 1>&2
   exit /b 127
 )
-if exist "%USERPROFILE%\\.dg\\state\\shim-nonce" (
-  set /p DG_SHIM_NONCE=<"%USERPROFILE%\\.dg\\state\\shim-nonce"
-  set "DG_SHIM_ACTIVE=!DG_SHIM_NONCE!"
-)
+set "DG_SHIM_NONCE="
+if exist "%USERPROFILE%\\.dg\\state\\shim-nonce" set /p DG_SHIM_NONCE=<"%USERPROFILE%\\.dg\\state\\shim-nonce"
+set "DG_ENTRY="
+if exist "%USERPROFILE%\\.dg\\state\\dg-entry" set /p DG_ENTRY=<"%USERPROFILE%\\.dg\\state\\dg-entry"
+set "DG_SHIM_ACTIVE=!DG_SHIM_NONCE!"
 set "DG_SHIM_PARENT_PATH=%PATH%"
-dg __wrap __ECOSYSTEM__ %*
-exit /b %errorlevel%
+if defined DG_ENTRY (
+  if exist "!DG_ENTRY!" (
+    node "!DG_ENTRY!" __wrap __ECOSYSTEM__ %*
+    exit /b !errorlevel!
+  )
+)
+set "_dg_cli="
+for /f "tokens=*" %%i in ('where dg 2^>nul') do (
+  echo %%i | findstr /v /c:"%USERPROFILE%\\.dg\\shims" >nul && (
+    if not defined _dg_cli set "_dg_cli=%%i"
+  )
+)
+if defined _dg_cli (
+  "!_dg_cli!" __wrap __ECOSYSTEM__ %*
+  exit /b !errorlevel!
+)
+set "_dg_realpm="
+for /f "tokens=*" %%i in ('where __ECOSYSTEM__ 2^>nul') do (
+  echo %%i | findstr /v /c:"%USERPROFILE%\\.dg\\shims" >nul && (
+    if not defined _dg_realpm set "_dg_realpm=%%i"
+  )
+)
+if defined _dg_realpm (
+  >>"%USERPROFILE%\\.dg\\state\\bypass.log" echo dg unresolved; passthrough __ECOSYSTEM__
+  "!_dg_realpm!" %*
+  exit /b !errorlevel!
+)
+echo dg: neither dg nor real __ECOSYSTEM__ found on PATH 1>&2
+exit /b 127
 `;
 function renderShim(opts) {
   const body = opts.platform === "windows" ? WINDOWS_SHIM_BODY : UNIX_SHIM_BODY;
@@ -310,6 +353,18 @@ function realBinaryCachePath() {
 }
 
 // src/shims/install.ts
+function currentDgEntry() {
+  try {
+    const entry = join4(dirname2(fileURLToPath(import.meta.url)), "index.mjs");
+    if (existsSync4(entry)) return entry;
+  } catch {
+  }
+  try {
+    return walkPathExcludingShimDir("dg");
+  } catch {
+    return null;
+  }
+}
 function chownIfNeeded(path, uid, gid) {
   if (uid === void 0 || gid === void 0) return;
   if (process.platform === "win32") return;
@@ -399,6 +454,12 @@ function installShims(opts = {}) {
   const noncePathResolved = join4(stateDir, "shim-nonce");
   safeWriteFile(noncePathResolved, nonce, 384);
   chownIfNeeded(noncePathResolved, opts.targetUid, opts.targetGid);
+  const dgEntry = currentDgEntry();
+  const dgEntryPathResolved = join4(stateDir, "dg-entry");
+  if (dgEntry) {
+    safeWriteFile(dgEntryPathResolved, dgEntry + "\n", 420);
+    chownIfNeeded(dgEntryPathResolved, opts.targetUid, opts.targetGid);
+  }
   const shimsCreated = [];
   for (const eco of ECOSYSTEMS) {
     const filename = shimFilename(eco, platform);
@@ -448,6 +509,7 @@ function installShims(opts = {}) {
     rcOutcomes,
     nonceFile: noncePathResolved,
     cacheFile: cachePathResolved,
+    dgEntry: dgEntry ?? null,
     nodeVersion: process.version,
     dgVersion: process.env.DG_CLI_VERSION ?? "unknown"
   };
@@ -467,7 +529,7 @@ function installShims(opts = {}) {
 
 // src/python-hook/install.ts
 import { existsSync as existsSync5, readFileSync as readFileSync4, unlinkSync as unlinkSync2, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
-import { dirname as dirname2, join as join5, resolve } from "node:path";
+import { dirname as dirname3, join as join5, resolve } from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { homedir as homedir6 } from "node:os";
 var SUPPORTED_PYTHON_VERSIONS = [
@@ -482,14 +544,14 @@ var SUPPORTED_PYTHON_VERSIONS = [
 function moduleAssetDir() {
   const scriptPath = process.argv[1] ?? "";
   const candidates = [
-    resolve(dirname2(scriptPath), "python-hook"),
-    resolve(dirname2(scriptPath), "..", "python-hook"),
-    resolve(dirname2(scriptPath), "src", "python-hook")
+    resolve(dirname3(scriptPath), "python-hook"),
+    resolve(dirname3(scriptPath), "..", "python-hook"),
+    resolve(dirname3(scriptPath), "src", "python-hook")
   ];
   for (const c of candidates) {
     if (existsSync5(join5(c, "dg_pip_hook.py"))) return c;
   }
-  return resolve(dirname2(scriptPath));
+  return resolve(dirname3(scriptPath));
 }
 function probeUserSite(pythonName) {
   try {
@@ -634,8 +696,8 @@ async function main() {
     emit("  Run `dg uninstall` to remove everything.");
   } catch (err) {
     emit("\u2139\uFE0F  Dependency Guardian installed.");
-    emit(`   Automatic shim wiring did not complete: ${err.message}`);
-    emit("   Run `dg init` to retry manually.");
+    emit(`   Setup did not complete: ${err.message}`);
+    emit("   Reinstall with `npm install -g @westbayberry/dg` to retry.");
   }
 }
 void main();

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@westbayberry/dg",
-  "version": "1.1.0",
+  "version": "1.1.3",
+  "type": "module",
   "description": "Supply chain security scanner for npm and Python dependencies — 35 behavioral detectors catch zero-day attacks CVE databases miss. 99.66% catch rate on 155K packages.",
   "bin": {
     "dependency-guardian": "dist/index.mjs",