Merge branch 'main' into feature/pipx-2

packages/safe-chain/bin/safe-chain.js

@@ -95,11 +95,6 @@ function writeHelp() {
       "safe-chain setup"
     )}: This will setup your shell to wrap safe-chain around npm, npx, yarn, pnpm, pnpx, bun, bunx, pip and pip3.`
   );
-  ui.writeInformation(
-    `    ${chalk.yellow(
-      "--include-python"
-    )}: Experimental: include Python package managers (pip, pip3) in the setup.`
-  );
   ui.writeInformation(
     `- ${chalk.cyan(
       "safe-chain teardown"
@@ -110,11 +105,6 @@ function writeHelp() {
       "safe-chain setup-ci"
     )}: This will setup safe-chain for CI environments by creating shims and modifying the PATH.`
   );
-  ui.writeInformation(
-    `    ${chalk.yellow(
-      "--include-python"
-    )}: Experimental: include Python package managers (pip, pip3) in the setup.`
-  );
   ui.writeInformation(
     `- ${chalk.cyan("safe-chain --version")} (or ${chalk.cyan(
       "-v"

packages/safe-chain/src/config/cliArguments.js

@@ -1,11 +1,12 @@
+import { ui } from "../environment/userInteraction.js";
+
 /**
- * @type {{loggingLevel: string | undefined, skipMinimumPackageAge: boolean | undefined, minimumPackageAgeHours: string | undefined, includePython: boolean}}
+ * @type {{loggingLevel: string | undefined, skipMinimumPackageAge: boolean | undefined, minimumPackageAgeHours: string | undefined}}
  */
 const state = {
   loggingLevel: undefined,
   skipMinimumPackageAge: undefined,
   minimumPackageAgeHours: undefined,
-  includePython: false,
 };
 
 const SAFE_CHAIN_ARG_PREFIX = "--safe-chain-";
@@ -34,8 +35,7 @@ export function initializeCliArguments(args) {
   setLoggingLevel(safeChainArgs);
   setSkipMinimumPackageAge(safeChainArgs);
   setMinimumPackageAgeHours(safeChainArgs);
-  setIncludePython(args);
-
+  checkDeprecatedPythonFlag(args);
   return remainingArgs;
 }
 
@@ -109,20 +109,6 @@ export function getMinimumPackageAgeHours() {
   return state.minimumPackageAgeHours;
 }
 
-/**
- * @param {string[]} args
- */
-function setIncludePython(args) {
-  // This flag doesn't have the --safe-chain- prefix because
-  // it is only used for the safe-chain command itself and
-  // not when wrapped around package manager commands.
-  state.includePython = hasFlagArg(args, "--include-python");
-}
-
-export function includePython() {
-  return state.includePython;
-}
-
 /**
  * @param {string[]} args
  * @param {string} flagName
@@ -136,3 +122,17 @@ function hasFlagArg(args, flagName) {
   }
   return false;
 }
+
+/**
+ * Emits a deprecation warning for legacy --include-python flag
+ *
+ * @param {string[]} args
+ * @returns {void}
+ */
+export function checkDeprecatedPythonFlag(args) {
+  if (hasFlagArg(args, "--include-python")) {
+    ui.writeWarning(
+      "--include-python is deprecated and ignored. Python tooling is included by default."
+    );
+  }
+}

packages/safe-chain/src/config/cliArguments.spec.js

@@ -6,6 +6,7 @@ import {
   getSkipMinimumPackageAge,
   getMinimumPackageAgeHours,
 } from "./cliArguments.js";
+import { ui } from "../environment/userInteraction.js";
 
 describe("initializeCliArguments", () => {
   it("should return all args when no safe-chain args are present", () => {
@@ -271,4 +272,40 @@ describe("initializeCliArguments", () => {
 
     assert.strictEqual(getMinimumPackageAgeHours(), "-24");
   });
+
+  it("should warn on deprecated --include-python for setup", () => {
+    const warnings = [];
+    const originalWriteWarning = ui.writeWarning;
+    ui.writeWarning = (msg, ..._rest) => {
+      warnings.push(String(msg));
+    };
+    try {
+      const argv = ["node", "safe-chain", "setup", "--include-python"];
+      initializeCliArguments(argv);
+      assert.ok(
+        warnings.some((m) => m.includes("--include-python is deprecated")),
+        "Expected a deprecation warning for --include-python in setup"
+      );
+    } finally {
+      ui.writeWarning = originalWriteWarning;
+    }
+  });
+
+  it("should warn on deprecated --include-python for setup-ci", () => {
+    const warnings = [];
+    const originalWriteWarning = ui.writeWarning;
+    ui.writeWarning = (msg, ..._rest) => {
+      warnings.push(String(msg));
+    };
+    try {
+      const argv = ["node", "safe-chain", "setup-ci", "--include-python"];
+      initializeCliArguments(argv);
+      assert.ok(
+        warnings.some((m) => m.includes("--include-python is deprecated")),
+        "Expected a deprecation warning for --include-python in setup-ci"
+      );
+    } finally {
+      ui.writeWarning = originalWriteWarning;
+    }
+  });
 });

packages/safe-chain/src/config/configFile.spec.js

@@ -1,32 +1,24 @@
 import { describe, it, beforeEach, afterEach, mock } from "node:test";
 import assert from "node:assert";
 
-describe("getScanTimeout", () => {
+let configFileContent = undefined;
+mock.module("fs", {
+  namedExports: {
+    existsSync: () => configFileContent !== undefined,
+    readFileSync: () => configFileContent,
+    writeFileSync: (content) => (configFileContent = content),
+    mkdirSync: () => {},
+  },
+});
+
+describe("getScanTimeout", async () => {
   let originalEnv;
-  let fsMock;
-  let getScanTimeout;
+
+  const { getScanTimeout } = await import("./configFile.js");
 
   beforeEach(async () => {
     // Save original environment
     originalEnv = process.env.AIKIDO_SCAN_TIMEOUT_MS;
-
-    // Mock fs module
-    fsMock = {
-      existsSync: mock.fn(() => false),
-      readFileSync: mock.fn(() => "{}"),
-      writeFileSync: mock.fn(),
-      mkdirSync: mock.fn(),
-    };
-
-    mock.module("fs", {
-      namedExports: fsMock,
-    });
-
-    // Re-import the module to get the mocked version
-    const configFileModule = await import(
-      `./configFile.js?update=${Date.now()}`
-    );
-    getScanTimeout = configFileModule.getScanTimeout;
   });
 
   afterEach(() => {
@@ -37,14 +29,12 @@ describe("getScanTimeout", () => {
       delete process.env.AIKIDO_SCAN_TIMEOUT_MS;
     }
 
-    // Reset all mocks
-    mock.restoreAll();
+    configFileContent = undefined;
   });
 
   it("should return default timeout of 10000ms when no config or env var is set", () => {
     delete process.env.AIKIDO_SCAN_TIMEOUT_MS;
-    // Mock: config file doesn't exist
-    fsMock.existsSync.mock.mockImplementation(() => false);
+    configFileContent = undefined;
 
     const timeout = getScanTimeout();
 
@@ -53,11 +43,7 @@ describe("getScanTimeout", () => {
 
   it("should return timeout from config file when set", () => {
     delete process.env.AIKIDO_SCAN_TIMEOUT_MS;
-    // Mock: config file exists with scanTimeout: 5000
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: 5000 })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: 5000 });
 
     const timeout = getScanTimeout();
 
@@ -66,11 +52,7 @@ describe("getScanTimeout", () => {
 
   it("should prioritize environment variable over config file", () => {
     process.env.AIKIDO_SCAN_TIMEOUT_MS = "20000";
-    // Mock: config file exists with scanTimeout: 5000
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: 5000 })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: 5000 });
 
     const timeout = getScanTimeout();
 
@@ -79,11 +61,7 @@ describe("getScanTimeout", () => {
 
   it("should handle invalid environment variable and fall back to config", () => {
     process.env.AIKIDO_SCAN_TIMEOUT_MS = "invalid";
-    // Mock: config file exists with scanTimeout: 7000
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: 7000 })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: 7000 });
 
     const timeout = getScanTimeout();
 
@@ -91,8 +69,7 @@ describe("getScanTimeout", () => {
   });
 
   it("should ignore zero and negative values and fall back to default", () => {
-    // Mock: config file doesn't exist
-    fsMock.existsSync.mock.mockImplementation(() => false);
+    configFileContent = undefined;
 
     process.env.AIKIDO_SCAN_TIMEOUT_MS = "0";
 
@@ -107,11 +84,7 @@ describe("getScanTimeout", () => {
 
   it("should ignore textual non-numeric values in environment variable and fall back to config", () => {
     process.env.AIKIDO_SCAN_TIMEOUT_MS = "fast";
-    // Mock: config file exists with scanTimeout: 8000
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: 8000 })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: 8000 });
 
     const timeout = getScanTimeout();
 
@@ -120,11 +93,7 @@ describe("getScanTimeout", () => {
 
   it("should ignore textual non-numeric values in config file and fall back to default", () => {
     delete process.env.AIKIDO_SCAN_TIMEOUT_MS;
-    // Mock: config file exists with scanTimeout: "slow"
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: "slow" })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: "slow" });
 
     const timeout = getScanTimeout();
 
@@ -133,11 +102,7 @@ describe("getScanTimeout", () => {
 
   it("should ignore textual non-numeric values in both env and config, fall back to default", () => {
     process.env.AIKIDO_SCAN_TIMEOUT_MS = "quick";
-    // Mock: config file exists with scanTimeout: "medium"
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: "medium" })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: "medium" });
 
     const timeout = getScanTimeout();
 
@@ -146,11 +111,7 @@ describe("getScanTimeout", () => {
 
   it("should ignore mixed alphanumeric strings in environment variable", () => {
     process.env.AIKIDO_SCAN_TIMEOUT_MS = "5000ms";
-    // Mock: config file exists with scanTimeout: 6000
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: 6000 })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: 6000 });
 
     const timeout = getScanTimeout();
 
@@ -159,11 +120,7 @@ describe("getScanTimeout", () => {
 
   it("should ignore mixed alphanumeric strings in config file", () => {
     delete process.env.AIKIDO_SCAN_TIMEOUT_MS;
-    // Mock: config file exists with scanTimeout: "3000ms"
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: "3000ms" })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: "3000ms" });
 
     const timeout = getScanTimeout();
 
@@ -171,37 +128,15 @@ describe("getScanTimeout", () => {
   });
 });
 
-describe("getMinimumPackageAgeHours", () => {
-  let fsMock;
-  let getMinimumPackageAgeHours;
-
-  beforeEach(async () => {
-    // Mock fs module
-    fsMock = {
-      existsSync: mock.fn(() => false),
-      readFileSync: mock.fn(() => "{}"),
-      writeFileSync: mock.fn(),
-      mkdirSync: mock.fn(),
-    };
-
-    mock.module("fs", {
-      namedExports: fsMock,
-    });
-
-    // Re-import the module to get the mocked version
-    const configFileModule = await import(
-      `./configFile.js?update=${Date.now()}`
-    );
-    getMinimumPackageAgeHours = configFileModule.getMinimumPackageAgeHours;
-  });
+describe("getMinimumPackageAgeHours", async () => {
+  const { getMinimumPackageAgeHours } = await import("./configFile.js");
 
   afterEach(() => {
-    // Reset all mocks
-    mock.restoreAll();
+    configFileContent = undefined;
   });
 
   it("should return null when config file doesn't exist", () => {
-    fsMock.existsSync.mock.mockImplementation(() => false);
+    configFileContent = undefined;
 
     const hours = getMinimumPackageAgeHours();
 
@@ -209,10 +144,7 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should return null when config file exists but minimumPackageAgeHours is not set", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ scanTimeout: 5000 })
-    );
+    configFileContent = JSON.stringify({ scanTimeout: 5000 });
 
     const hours = getMinimumPackageAgeHours();
 
@@ -220,10 +152,7 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should return value from config file when set to valid number", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: 48 })
-    );
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: 48 });
 
     const hours = getMinimumPackageAgeHours();
 
@@ -231,10 +160,7 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should handle string numbers in config file", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: "72" })
-    );
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: "72" });
 
     const hours = getMinimumPackageAgeHours();
 
@@ -242,10 +168,7 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should handle decimal values", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: 1.5 })
-    );
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: 1.5 });
 
     const hours = getMinimumPackageAgeHours();
 
@@ -253,21 +176,15 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should return null for non-numeric strings", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: "invalid" })
-    );
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: "invalid" });
 
     const hours = getMinimumPackageAgeHours();
 
     assert.strictEqual(hours, undefined);
   });
 
-  it("should return null for values with units suffix", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: "48h" })
-    );
+  it("should return undefined for values with units suffix", () => {
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: "48h" });
 
     const hours = getMinimumPackageAgeHours();
 
@@ -275,8 +192,7 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should handle malformed JSON and return null", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() => "{ invalid json");
+    configFileContent = "{ invalid json";
 
     const hours = getMinimumPackageAgeHours();
 
@@ -284,10 +200,7 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should return 0 when minimumPackageAgeHours is set to 0", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: 0 })
-    );
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: 0 });
 
     const hours = getMinimumPackageAgeHours();
 
@@ -295,10 +208,7 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should return 0 when minimumPackageAgeHours is set to string '0'", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: "0" })
-    );
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: "0" });
 
     const hours = getMinimumPackageAgeHours();
 
@@ -306,10 +216,7 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should handle negative numeric values", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: -24 })
-    );
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: -24 });
 
     const hours = getMinimumPackageAgeHours();
 
@@ -317,86 +224,10 @@ describe("getMinimumPackageAgeHours", () => {
   });
 
   it("should handle negative string values", () => {
-    fsMock.existsSync.mock.mockImplementation(() => true);
-    fsMock.readFileSync.mock.mockImplementation(() =>
-      JSON.stringify({ minimumPackageAgeHours: "-48" })
-    );
+    configFileContent = JSON.stringify({ minimumPackageAgeHours: "-48" });
 
     const hours = getMinimumPackageAgeHours();
 
     assert.strictEqual(hours, -48);
   });
 });
-
-describe("environmentVariables - getMinimumPackageAgeHours", () => {
-  let originalEnv;
-  let getMinimumPackageAgeHours;
-
-  beforeEach(async () => {
-    // Save original environment
-    originalEnv = process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS;
-
-    // Re-import the module to get fresh version
-    const envModule = await import(
-      `./environmentVariables.js?update=${Date.now()}`
-    );
-    getMinimumPackageAgeHours = envModule.getMinimumPackageAgeHours;
-  });
-
-  afterEach(() => {
-    // Restore original environment
-    if (originalEnv !== undefined) {
-      process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS = originalEnv;
-    } else {
-      delete process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS;
-    }
-  });
-
-  it("should return undefined when environment variable is not set", () => {
-    delete process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS;
-
-    const hours = getMinimumPackageAgeHours();
-
-    assert.strictEqual(hours, undefined);
-  });
-
-  it("should return value when environment variable is set to a number", () => {
-    process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS = "48";
-
-    const hours = getMinimumPackageAgeHours();
-
-    assert.strictEqual(hours, "48");
-  });
-
-  it("should return '0' when environment variable is set to '0'", () => {
-    process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS = "0";
-
-    const hours = getMinimumPackageAgeHours();
-
-    assert.strictEqual(hours, "0");
-  });
-
-  it("should return value when set to decimal", () => {
-    process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS = "1.5";
-
-    const hours = getMinimumPackageAgeHours();
-
-    assert.strictEqual(hours, "1.5");
-  });
-
-  it("should return value even if non-numeric (validation happens in settings.js)", () => {
-    process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS = "invalid";
-
-    const hours = getMinimumPackageAgeHours();
-
-    assert.strictEqual(hours, "invalid");
-  });
-
-  it("should return negative values (validation happens in settings.js)", () => {
-    process.env.SAFE_CHAIN_MINIMUM_PACKAGE_AGE_HOURS = "-24";
-
-    const hours = getMinimumPackageAgeHours();
-
-    assert.strictEqual(hours, "-24");
-  });
-});

packages/safe-chain/src/shell-integration/setup-ci.js

@@ -5,8 +5,6 @@ import fs from "fs";
 import os from "os";
 import path from "path";
 import { fileURLToPath } from "url";
-import { includePython } from "../config/cliArguments.js";
-import { ECOSYSTEM_PY } from "../config/settings.js";
 
 /** @type {string} */
 // This checks the current file's dirname in a way that's compatible with:
@@ -162,9 +160,5 @@ function modifyPathForCi(shimsDir, binDir) {
 }
 
 function getToolsToSetup() {
-  if (includePython()) {
-    return knownAikidoTools;
-  } else {
-    return knownAikidoTools.filter((tool) => tool.ecoSystem !== ECOSYSTEM_PY);
-  }
+  return knownAikidoTools;
 }

packages/safe-chain/src/shell-integration/setup.js

@@ -4,7 +4,6 @@ import { detectShells } from "./shellDetection.js";
 import { knownAikidoTools, getPackageManagerList, getScriptsDir } from "./helpers.js";
 import fs from "fs";
 import path from "path";
-import { includePython } from "../config/cliArguments.js";
 import { fileURLToPath } from "url";
 
 /** @type {string} */
@@ -118,7 +117,7 @@ function copyStartupFiles() {
     // Use absolute path for source
     const sourcePath = path.join(
       dirname,
-      includePython() ? "startup-scripts/include-python" : "startup-scripts",
+      "startup-scripts",
       file
     );
     fs.copyFileSync(sourcePath, targetPath);

packages/safe-chain/src/shell-integration/startup-scripts/include-python/init-fish.fish

@@ -1,98 +0,0 @@
-set -gx PATH $PATH $HOME/.safe-chain/bin
-
-function npx
-    wrapSafeChainCommand "npx" $argv
-end
-
-function yarn
-    wrapSafeChainCommand "yarn" $argv
-end
-
-function pnpm
-    wrapSafeChainCommand "pnpm" $argv
-end
-
-function pnpx
-    wrapSafeChainCommand "pnpx" $argv
-end
-
-function bun
-    wrapSafeChainCommand "bun" $argv
-end
-
-function bunx
-    wrapSafeChainCommand "bunx" $argv
-end
-
-function npm
-    # If args is just -v or --version and nothing else, just run the `npm -v` command
-    # This is because nvm uses this to check the version of npm
-    set argc (count $argv)
-    if test $argc -eq 1
-        switch $argv[1]
-            case "-v" "--version"
-                command npm $argv
-                return
-        end
-    end
-
-    wrapSafeChainCommand "npm" $argv
-end
-
-
-function pip
-    wrapSafeChainCommand "pip" $argv
-end
-
-function pip3
-    wrapSafeChainCommand "pip3" $argv
-end
-
-function uv
-    wrapSafeChainCommand "uv" $argv
-end
-
-function poetry
-    wrapSafeChainCommand "poetry" $argv
-end
-
-# `python -m pip`, `python -m pip3`.
-function python
-    wrapSafeChainCommand "python" $argv
-end
-
-# `python3 -m pip`, `python3 -m pip3'.
-function python3
-    wrapSafeChainCommand "python3" $argv
-end
-
-function printSafeChainWarning
-    set original_cmd $argv[1]
-    
-    # Fish equivalent of ANSI color codes: yellow background, black text for "Warning:"
-    set_color -b yellow black
-    printf "Warning:"
-    set_color normal
-    printf " safe-chain is not available to protect you from installing malware. %s will run without it.\n" $original_cmd
-    
-    # Cyan text for the install command
-    printf "Install safe-chain by using "
-    set_color cyan
-    printf "npm install -g @aikidosec/safe-chain"
-    set_color normal
-    printf ".\n"
-end
-
-function wrapSafeChainCommand
-    set original_cmd $argv[1]
-    set cmd_args $argv[2..-1]
-
-    if type -q safe-chain
-        # If the safe-chain command is available, just run it with the provided arguments
-        safe-chain $original_cmd $cmd_args
-    else
-        # If the safe-chain command is not available, print a warning and run the original command
-        printSafeChainWarning $original_cmd
-        command $original_cmd $cmd_args
-    end
-end

packages/safe-chain/src/shell-integration/startup-scripts/include-python/init-posix.sh

@@ -1,85 +0,0 @@
-export PATH="$PATH:$HOME/.safe-chain/bin"
-
-function npx() {
-  wrapSafeChainCommand "npx" "$@"
-}
-
-function yarn() {
-  wrapSafeChainCommand "yarn" "$@"
-}
-
-function pnpm() {
-  wrapSafeChainCommand "pnpm" "$@"
-}
-
-function pnpx() {
-  wrapSafeChainCommand "pnpx" "$@"
-}
-
-function bun() {
-  wrapSafeChainCommand "bun" "$@"
-}
-
-function bunx() {
-  wrapSafeChainCommand "bunx" "$@"
-}
-
-function npm() {
-  if [[ "$1" == "-v" || "$1" == "--version" ]] && [[ $# -eq 1 ]]; then
-    # If args is just -v or --version and nothing else, just run the npm version command
-    # This is because nvm uses this to check the version of npm
-    command npm "$@"
-    return
-  fi
-
-  wrapSafeChainCommand "npm" "$@"
-}
-
-
-function pip() {
-  wrapSafeChainCommand "pip" "$@"
-}
-
-function pip3() {
-  wrapSafeChainCommand "pip3" "$@"
-}
-
-function uv() {
-  wrapSafeChainCommand "uv" "$@"
-}
-
-function poetry() {
-  wrapSafeChainCommand "poetry" "$@"
-}
-
-# `python -m pip`, `python -m pip3`.
-function python() {
-  wrapSafeChainCommand "python" "$@"
-}
-
-# `python3 -m pip`, `python3 -m pip3'.
-function python3() {
-  wrapSafeChainCommand "python3" "$@"
-}
-
-function printSafeChainWarning() {
-  # \033[43;30m is used to set the background color to yellow and text color to black
-  # \033[0m is used to reset the text formatting
-  printf "\033[43;30mWarning:\033[0m safe-chain is not available to protect you from installing malware. %s will run without it.\n" "$1"
-  # \033[36m is used to set the text color to cyan
-  printf "Install safe-chain by using \033[36mnpm install -g @aikidosec/safe-chain\033[0m.\n"
-}
-
-function wrapSafeChainCommand() {
-  local original_cmd="$1"
-
-  if command -v safe-chain > /dev/null 2>&1; then
-    # If the aikido command is available, just run it with the provided arguments
-    safe-chain "$@"
-  else
-    # If the aikido command is not available, print a warning and run the original command
-    printSafeChainWarning "$original_cmd"
-
-    command "$original_cmd" "$@"
-  fi
-}

packages/safe-chain/src/shell-integration/startup-scripts/include-python/init-pwsh.ps1

@@ -1,119 +0,0 @@
-# Use cross-platform path separator (: on Unix, ; on Windows)
-$pathSeparator = if ($IsWindows) { ';' } else { ':' }
-$safeChainBin = Join-Path (Join-Path $HOME '.safe-chain') 'bin'
-$env:PATH = "$env:PATH$pathSeparator$safeChainBin"
-
-function npx {
-    Invoke-WrappedCommand "npx" $args
-}
-
-function yarn {
-    Invoke-WrappedCommand "yarn" $args
-}
-
-function pnpm {
-    Invoke-WrappedCommand "pnpm" $args
-}
-
-function pnpx {
-    Invoke-WrappedCommand "pnpx" $args
-}
-
-function bun {
-    Invoke-WrappedCommand "bun" $args
-}
-
-function bunx {
-    Invoke-WrappedCommand "bunx" $args
-}
-
-function npm {
-    # If args is just -v or --version and nothing else, just run the npm version command
-    # This is because nvm uses this to check the version of npm
-    if (($args.Length -eq 1) -and (($args[0] -eq "-v") -or ($args[0] -eq "--version"))) {
-        Invoke-RealCommand "npm" $args
-        return
-    }
-
-    Invoke-WrappedCommand "npm" $args
-}
-
-function pip {
-    Invoke-WrappedCommand "pip" $args
-}
-
-function pip3 {
-    Invoke-WrappedCommand "pip3" $args
-}
-
-function uv {
-    Invoke-WrappedCommand "uv" $args
-}
-
-function poetry {
-    Invoke-WrappedCommand "poetry" $args
-}
-
-# `python -m pip`, `python -m pip3`.
-function python {
-    Invoke-WrappedCommand 'python' $args
-}
-
-# `python3 -m pip`, `python3 -m pip3'.
-function python3 {
-    Invoke-WrappedCommand 'python3' $args
-}
-
-
-function Write-SafeChainWarning {
-    param([string]$Command)
-    
-    # PowerShell equivalent of ANSI color codes: yellow background, black text for "Warning:"
-    Write-Host "Warning:" -BackgroundColor Yellow -ForegroundColor Black -NoNewline
-    Write-Host " safe-chain is not available to protect you from installing malware. $Command will run without it."
-    
-    # Cyan text for the install command
-    Write-Host "Install safe-chain by using " -NoNewline
-    Write-Host "npm install -g @aikidosec/safe-chain" -ForegroundColor Cyan -NoNewline
-    Write-Host "."
-}
-
-function Test-CommandAvailable {
-    param([string]$Command)
-    
-    try {
-        Get-Command $Command -ErrorAction Stop | Out-Null
-        return $true
-    }
-    catch {
-        return $false
-    }
-}
-
-function Invoke-RealCommand {
-    param(
-        [string]$Command,
-        [string[]]$Arguments
-    )
-    
-    # Find the real executable to avoid calling our wrapped functions
-    $realCommand = Get-Command -Name $Command -CommandType Application | Select-Object -First 1
-    if ($realCommand) {
-        & $realCommand.Source @Arguments
-    }
-}
-
-function Invoke-WrappedCommand {
-    param(
-        [string]$OriginalCmd,
-        [string[]]$Arguments
-    )
-
-    if (Test-CommandAvailable "safe-chain") {
-        & safe-chain $OriginalCmd @Arguments
-    }
-    else {
-        Write-SafeChainWarning $OriginalCmd
-        Invoke-RealCommand $OriginalCmd $Arguments
-    }
-}

packages/safe-chain/src/shell-integration/startup-scripts/init-fish.fish

@@ -39,6 +39,33 @@ function npm
     wrapSafeChainCommand "npm" $argv
 end
 
+
+function pip
+    wrapSafeChainCommand "pip" $argv
+end
+
+function pip3
+    wrapSafeChainCommand "pip3" $argv
+end
+
+function uv
+    wrapSafeChainCommand "uv" $argv
+end
+
+function poetry
+    wrapSafeChainCommand "poetry" $argv
+end
+
+# `python -m pip`, `python -m pip3`.
+function python
+    wrapSafeChainCommand "python" $argv
+end
+
+# `python3 -m pip`, `python3 -m pip3'.
+function python3
+    wrapSafeChainCommand "python3" $argv
+end
+
 function printSafeChainWarning
     set original_cmd $argv[1]
     

packages/safe-chain/src/shell-integration/startup-scripts/init-posix.sh

@@ -35,6 +35,33 @@ function npm() {
   wrapSafeChainCommand "npm" "$@"
 }
 
+
+function pip() {
+  wrapSafeChainCommand "pip" "$@"
+}
+
+function pip3() {
+  wrapSafeChainCommand "pip3" "$@"
+}
+
+function uv() {
+  wrapSafeChainCommand "uv" "$@"
+}
+
+function poetry() {
+  wrapSafeChainCommand "poetry" "$@"
+}
+
+# `python -m pip`, `python -m pip3`.
+function python() {
+  wrapSafeChainCommand "python" "$@"
+}
+
+# `python3 -m pip`, `python3 -m pip3'.
+function python3() {
+  wrapSafeChainCommand "python3" "$@"
+}
+
 function printSafeChainWarning() {
   # \033[43;30m is used to set the background color to yellow and text color to black
   # \033[0m is used to reset the text formatting

packages/safe-chain/src/shell-integration/startup-scripts/init-pwsh.ps1

@@ -1,5 +1,7 @@
 # Use cross-platform path separator (: on Unix, ; on Windows)
-$pathSeparator = if ($IsWindows) { ';' } else { ':' }
+# $IsWindows is only available in PowerShell Core 6.0+. If it doesn't exist, assume Windows PowerShell
+$isWindowsPlatform = if (Test-Path variable:IsWindows) { $IsWindows } else { $true }
+$pathSeparator = if ($isWindowsPlatform) { ';' } else { ':' }
 $safeChainBin = Join-Path (Join-Path $HOME '.safe-chain') 'bin'
 $env:PATH = "$env:PATH$pathSeparator$safeChainBin"
 
@@ -38,6 +40,33 @@ function npm {
     Invoke-WrappedCommand "npm" $args
 }
 
+function pip {
+    Invoke-WrappedCommand "pip" $args
+}
+
+function pip3 {
+    Invoke-WrappedCommand "pip3" $args
+}
+
+function uv {
+    Invoke-WrappedCommand "uv" $args
+}
+
+function poetry {
+    Invoke-WrappedCommand "poetry" $args
+}
+
+# `python -m pip`, `python -m pip3`.
+function python {
+    Invoke-WrappedCommand 'python' $args
+}
+
+# `python3 -m pip`, `python3 -m pip3'.
+function python3 {
+    Invoke-WrappedCommand 'python3' $args
+}
+
+
 function Write-SafeChainWarning {
     param([string]$Command)