trident-tui 0.9.2 → 0.9.4

package/bin/cli.js

@@ -21,7 +21,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const SANDBOX_IMAGE = 'ghcr.io/usestrix/strix-sandbox:0.1.13';
+const SANDBOX_IMAGE = 'ghcr.io/esprit-labs/trident-sandbox:0.1.13';
 const isWin = process.platform === 'win32';
 const HOME = os.homedir();
 const LOCAL_BIN = path.join(HOME, '.local', 'bin');
@@ -125,34 +125,55 @@ function main() {
     process.exit(1);
   }
 
-  // Install the global `trident` (and `strix`) command so it's available
-  // directly in future terminals — not only via `npx`. Only (re)install when
-  // the installed version differs from the bundled wheel, to stay fast.
-  const wheelVer = (path.basename(wheel).match(/strix_agent-(\d+\.\d+\.\d+)/) || [])[1] || null;
-  let installedVer = null;
-  const vcheck = spawnSync('trident', ['--version'], { encoding: 'utf8' });
-  if (vcheck.status === 0 && vcheck.stdout) {
-    installedVer = (vcheck.stdout.match(/(\d+\.\d+\.\d+)/) || [])[1] || null;
+  // Version baked into the bundled wheel filename (matches both the legacy
+  // `strix_agent-` and the new `trident_agent-` naming).
+  const wheelVer =
+    (path.basename(wheel).match(/(?:strix|trident)_agent-(\d+\.\d+\.\d+)/) || [])[1] || null;
+
+  // Return the working global `trident` version, or null if it is not installed
+  // OR is installed-but-broken (a half-removed previous install throws
+  // ModuleNotFoundError, which makes `--version` exit non-zero).
+  function workingTridentVersion() {
+    const v = spawnSync('trident', ['--version'], { encoding: 'utf8' });
+    if (v.status === 0 && v.stdout) {
+      return (v.stdout.match(/(\d+\.\d+\.\d+)/) || [])[1] || null;
+    }
+    return null;
   }
-  if (!installedVer || installedVer !== wheelVer) {
+
+  // Install the global `trident` command so it's available directly in future
+  // terminals — not only via `npx`. Only (re)install when the working installed
+  // version differs from the bundled wheel. Best-effort: failure here is NOT
+  // fatal because the bundled-wheel fallback below always works.
+  if (workingTridentVersion() !== wheelVer) {
     log('Installing the `trident` command (one-time)…');
+    // Clear any previous (possibly broken or locked) install first, so a Windows
+    // file lock on the old Scripts dir can't fail the --force reinstall. Both
+    // the legacy `strix-agent` and the current `trident-agent` tool names are
+    // cleared. Errors are ignored — the wheel fallback covers us regardless.
+    spawnSync(uv, ['tool', 'uninstall', 'trident-agent'], { stdio: 'ignore' });
+    spawnSync(uv, ['tool', 'uninstall', 'strix-agent'], { stdio: 'ignore' });
     const inst = spawnSync(uv, ['tool', 'install', '--force', wheel], { stdio: 'inherit' });
     if (inst.status === 0) {
       spawnSync(uv, ['tool', 'update-shell'], { stdio: 'ignore' });
-      log('[ok] `trident` and `strix` installed — open a NEW terminal to run `trident` directly.');
+      log('[ok] `trident` installed — open a NEW terminal to run `trident` directly.');
     } else {
-      log('[!] Could not install the global `trident` command; continuing via npx for now.');
+      log('[!] Could not install the global `trident` command; running via npx for now.');
     }
   }
 
   prePullImage();
 
-  // Make the freshly-installed command reachable in THIS process, then run it.
-  // Falls back to an ephemeral run if it isn't on PATH yet.
+  // Make a freshly-installed command reachable in THIS process.
   process.env.PATH = LOCAL_BIN + path.delimiter + (process.env.PATH || '');
   const args = process.argv.slice(2);
+
+  // Run the global `trident` ONLY if it works AND matches the bundled version.
+  // A stale or broken global (e.g. a half-removed previous install that raises
+  // ModuleNotFoundError) must never be run — fall back to the bundled wheel,
+  // which runs in a clean ephemeral environment and cannot be in a broken state.
   let r;
-  if (commandPath('trident')) {
+  if (commandPath('trident') && workingTridentVersion() === wheelVer) {
     r = spawnSync('trident', args, { stdio: 'inherit' });
   } else {
     r = spawnSync(uv, ['tool', 'run', '--from', wheel, 'trident', ...args], { stdio: 'inherit' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trident-tui",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Trident — AI penetration-testing agent. Run it with `npx trident-tui`; it bootstraps everything and prompts for your API key.",
   "bin": {
     "trident-tui": "bin/cli.js"