agentworth 0.1.9 → 0.1.10

package/lib/resolver.js

@@ -411,9 +411,17 @@ export function resolveBinary(options = {}) {
     }
   }
 
+  // 4-7 all found a real, executable candidate but said nothing about whether it's the
+  // version this launcher is meant to run -- so a debug build from six releases ago,
+  // sitting in some worktree's target/ directory upward of wherever the user happened to
+  // invoke `agentworth` from, would silently win over the correctly-versioned release cache
+  // (8) forever. Same failure mode already fixed for PATH (3) above, same fix here: a
+  // candidate only counts if it reports the version this launcher ships.
+  const expectedVersion = getPackageVersion(baseDir);
+
   // 4. Local Cargo target from working directory
   const cwdCargoBin = findCargoTargetBinary(cwd, binName);
-  if (cwdCargoBin) {
+  if (cwdCargoBin && pathBinaryMatchesVersion(cwdCargoBin, expectedVersion)) {
     return {
       found: true,
       path: cwdCargoBin,
@@ -423,7 +431,7 @@ export function resolveBinary(options = {}) {
 
   // 5. Local Cargo target from package directory hierarchy
   const pkgCargoBin = findCargoTargetBinary(baseDir, binName);
-  if (pkgCargoBin) {
+  if (pkgCargoBin && pathBinaryMatchesVersion(pkgCargoBin, expectedVersion)) {
     return {
       found: true,
       path: pkgCargoBin,
@@ -434,7 +442,7 @@ export function resolveBinary(options = {}) {
   // 6. CARGO_TARGET_DIR environment variable if specified
   if (env.CARGO_TARGET_DIR) {
     const targetDirRelease = path.join(env.CARGO_TARGET_DIR, 'release', binName);
-    if (isExecutable(targetDirRelease)) {
+    if (isExecutable(targetDirRelease) && pathBinaryMatchesVersion(targetDirRelease, expectedVersion)) {
       return {
         found: true,
         path: targetDirRelease,
@@ -442,7 +450,7 @@ export function resolveBinary(options = {}) {
       };
     }
     const targetDirDebug = path.join(env.CARGO_TARGET_DIR, 'debug', binName);
-    if (isExecutable(targetDirDebug)) {
+    if (isExecutable(targetDirDebug) && pathBinaryMatchesVersion(targetDirDebug, expectedVersion)) {
       return {
         found: true,
         path: targetDirDebug,
@@ -454,7 +462,7 @@ export function resolveBinary(options = {}) {
   // 7. User ~/.cargo/bin directory
   if (homeDir) {
     const cargoHomeBin = path.join(homeDir, '.cargo', 'bin', binName);
-    if (isExecutable(cargoHomeBin)) {
+    if (isExecutable(cargoHomeBin) && pathBinaryMatchesVersion(cargoHomeBin, expectedVersion)) {
       return {
         found: true,
         path: cargoHomeBin,
@@ -462,8 +470,9 @@ export function resolveBinary(options = {}) {
       };
     }
 
-    // 8. User local cache (~/.agentworth/bin/v{version}/)
-    const cacheDir = getCacheDir(getPackageVersion(baseDir), homeDir);
+    // 8. User local cache (~/.agentworth/bin/v{version}/) -- versioned by construction,
+    // nothing to check.
+    const cacheDir = getCacheDir(expectedVersion, homeDir);
     const cachedBin = path.join(cacheDir, binName);
     if (isExecutable(cachedBin)) {
       return {
@@ -507,6 +516,23 @@ export function formatMissingBinaryMessage(platformKey = getPlatformKey()) {
   ].join('\n');
 }
 
+/**
+ * Builds the environment passed to the spawned native binary: the caller's base env plus
+ * the launcher markers the binary's `agentworth version`/`agentworth update` commands read
+ * to detect an npm-managed install (see `apps/cli/src/commands/version_info.rs`).
+ *
+ * @param {NodeJS.ProcessEnv} baseEnv
+ * @param {string} npmVersion
+ * @returns {NodeJS.ProcessEnv}
+ */
+export function buildChildEnv(baseEnv, npmVersion) {
+  return {
+    ...baseEnv,
+    AGENTWORTH_LAUNCHER_ACTIVE: '1',
+    AGENTWORTH_NPM_VERSION: npmVersion,
+  };
+}
+
 /**
  * Launches the native binary with the given arguments.
  *
@@ -549,8 +575,11 @@ export function run(argv = process.argv.slice(2), options = {}) {
     return 1;
   }
 
-  // Belt and braces: a child that somehow re-enters this launcher cannot loop.
-  const childEnv = { ...(options.env || process.env), AGENTWORTH_LAUNCHER_ACTIVE: '1' };
+  // Belt and braces: a child that somehow re-enters this launcher cannot loop (the
+  // recursion guard in findPathBinary checks AGENTWORTH_LAUNCHER_ACTIVE). The npm version
+  // is threaded through too, purely so `agentworth version`/`agentworth update` can report
+  // it -- this launcher never reads it back itself.
+  const childEnv = buildChildEnv(options.env || process.env, getPackageVersion(options.baseDir || __dirname));
   const result = spawnSync(binaryResult.path, resolvedArgs, {
     stdio: 'inherit',
     env: childEnv,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentworth",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Discover, normalize, and understand AI-agent histories locally.",
   "type": "module",
   "main": "./lib/resolver.js",