@sylphai/adal-cli 0.5.0-beta.1 → 0.5.0-beta.3

package/bin/adal-cli.js

@@ -52,8 +52,18 @@ function loadCachedPath() {
   try {
     if (fs.existsSync(cacheFile)) {
       const cache = JSON.parse(fs.readFileSync(cacheFile, 'utf8'));
-      // Verify the cached path still exists
+      // Verify the cached path still exists AND points to wrapper (not adal-cli.js)
+      const expectedWrapper = platform === 'win32' ? 'adal.cmd' : 'adal';
       if (cache.path && fs.existsSync(cache.path)) {
+        // CRITICAL: Reject cache if it points to adal-cli.js (stale Bun migration cache)
+        if (cache.path.endsWith('adal-cli.js')) {
+          // Stale cache from before Bun migration - must find wrapper instead
+          return null;
+        }
+        // Verify path ends with expected wrapper name
+        if (!cache.path.endsWith(expectedWrapper)) {
+          return null;
+        }
         // Check if it's been less than 30 days since last cache
         const cacheAge = Date.now() - cache.timestamp;
         if (cacheAge < 30 * 24 * 60 * 60 * 1000) { // 30 days in milliseconds
@@ -69,6 +79,7 @@ function loadCachedPath() {
 
 // Save path to cache
 function saveCachedPath(platformPath) {
+  const expectedWrapper = platform === 'win32' ? 'adal.cmd' : 'adal';
   try {
     if (!fs.existsSync(cacheDir)) {
       fs.mkdirSync(cacheDir, { recursive: true });
@@ -77,6 +88,7 @@ function saveCachedPath(platformPath) {
       path: platformPath,
       platform: platformKey,
       package: packageName,
+      wrapperType: expectedWrapper,
       timestamp: Date.now()
     }, null, 2));
   } catch (e) {
@@ -97,16 +109,16 @@ function findPlatformPackage() {
   }
 
   // If no cache or cache is stale, search for the package
+  // Look for the 'adal' wrapper script (not adal-cli.js) which uses bundled Bun
+  const wrapperName = platform === 'win32' ? 'adal.cmd' : 'adal';
   const possiblePaths = [
-    // When installed globally
-    path.join(__dirname, '..', '..', packageName, 'adal-cli.js'),
+    // When installed globally - platform package is in main package's node_modules
+    path.join(__dirname, '..', 'node_modules', packageName, wrapperName),
     // When installed locally in a project
-    path.join(process.cwd(), 'node_modules', packageName, 'adal-cli.js'),
-    // When running from development
-    path.join(__dirname, '..', 'node_modules', packageName, 'adal-cli.js'),
-    // Alternative global location
-    require.resolve.paths(packageName).map(p => path.join(p, packageName, 'adal-cli.js')).filter(Boolean)
-  ].flat();
+    path.join(process.cwd(), 'node_modules', packageName, wrapperName),
+    // Alternative: sibling in global node_modules (flat install)
+    path.join(__dirname, '..', '..', '..', packageName, wrapperName),
+  ];
 
   for (const testPath of possiblePaths) {
     if (fs.existsSync(testPath)) {
@@ -118,7 +130,7 @@ function findPlatformPackage() {
   // Try using require.resolve as last resort
   try {
     const packagePath = require.resolve(`${packageName}/package.json`);
-    const platformBinary = path.join(path.dirname(packagePath), 'adal-cli.js');
+    const platformBinary = path.join(path.dirname(packagePath), wrapperName);
     if (fs.existsSync(platformBinary)) {
       saveCachedPath(platformBinary); // Cache the found path
       return platformBinary;
@@ -144,10 +156,11 @@ if (!platformBinary) {
   process.exit(1);
 }
 
-// Execute the platform-specific binary with all arguments
-const child = spawn(process.execPath, [platformBinary, ...process.argv.slice(2)], {
+// Execute the platform-specific wrapper (uses bundled Bun runtime)
+const child = spawn(platformBinary, process.argv.slice(2), {
   stdio: 'inherit',
   env: process.env,
+  shell: platform === 'win32', // Windows needs shell for .cmd files
 });
 
 // Forward the exit code

package/lib/setup-cache.js

@@ -35,30 +35,20 @@ const cacheFile = path.join(cacheDir, 'platform-path.json');
 
 // Find the platform package during installation
 function findAndCachePlatformPackage() {
+  // Look for wrapper script (uses bundled Bun), not adal-cli.js
+  const wrapperName = platform === 'win32' ? 'adal.cmd' : 'adal';
   const possiblePaths = [
-    // When installed globally
-    path.join(__dirname, '..', '..', packageName, 'adal-cli.js'),
+    // When installed globally - platform package is in main package's node_modules
+    path.join(__dirname, '..', 'node_modules', packageName, wrapperName),
     // When installed locally in a project
-    path.join(process.cwd(), 'node_modules', packageName, 'adal-cli.js'),
-    // When running from development
-    path.join(__dirname, '..', 'node_modules', packageName, 'adal-cli.js'),
+    path.join(process.cwd(), 'node_modules', packageName, wrapperName),
+    // Alternative: sibling in global node_modules (flat install)
+    path.join(__dirname, '..', '..', '..', packageName, wrapperName),
   ];
 
-  // Also check require.resolve paths
-  try {
-    const resolvePaths = require.resolve.paths(packageName);
-    if (resolvePaths) {
-      resolvePaths.forEach(p => {
-        possiblePaths.push(path.join(p, packageName, 'adal-cli.js'));
-      });
-    }
-  } catch (e) {
-    // Ignore errors
-  }
-
   for (const testPath of possiblePaths) {
     if (fs.existsSync(testPath)) {
-      // Found the platform package, cache it
+      // Found the platform wrapper, cache it
       try {
         if (!fs.existsSync(cacheDir)) {
           fs.mkdirSync(cacheDir, { recursive: true });
@@ -67,13 +57,14 @@ function findAndCachePlatformPackage() {
           path: testPath,
           platform: platformKey,
           package: packageName,
+          wrapperType: wrapperName,
           timestamp: Date.now(),
           installedAt: new Date().toISOString()
         }, null, 2));
-        console.log(`✅ Cached platform package path: ${packageName}`);
+        console.log(`✅ Cached platform wrapper path: ${packageName}/${wrapperName}`);
       } catch (e) {
         // Cache write failed, not critical
-        console.log(`⚠️  Could not cache platform package path: ${e.message}`);
+        console.log(`⚠️  Could not cache platform wrapper path: ${e.message}`);
       }
       return;
     }
@@ -82,7 +73,7 @@ function findAndCachePlatformPackage() {
   // Try using require.resolve as last resort
   try {
     const packagePath = require.resolve(`${packageName}/package.json`);
-    const platformBinary = path.join(path.dirname(packagePath), 'adal-cli.js');
+    const platformBinary = path.join(path.dirname(packagePath), wrapperName);
     if (fs.existsSync(platformBinary)) {
       // Cache the found path
       if (!fs.existsSync(cacheDir)) {
@@ -92,10 +83,11 @@ function findAndCachePlatformPackage() {
         path: platformBinary,
         platform: platformKey,
         package: packageName,
+        wrapperType: wrapperName,
         timestamp: Date.now(),
         installedAt: new Date().toISOString()
       }, null, 2));
-      console.log(`✅ Cached platform package path: ${packageName}`);
+      console.log(`✅ Cached platform wrapper path: ${packageName}/${wrapperName}`);
     }
   } catch (e) {
     // Platform package not found during install, will be found at runtime

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sylphai/adal-cli",
-  "version": "0.5.0-beta.1",
+  "version": "0.5.0-beta.3",
   "description": "AI-powered CLI for development and research tasks",
   "bin": {
     "adal": "bin/adal-cli.js"
@@ -9,10 +9,10 @@
     "postinstall": "node lib/setup-cache.js"
   },
   "optionalDependencies": {
-    "@sylphai/adal-cli-darwin-arm64": "0.5.0-beta.1",
-    "@sylphai/adal-cli-darwin-x64": "0.5.0-beta.1",
-    "@sylphai/adal-cli-linux-x64": "0.5.0-beta.1",
-    "@sylphai/adal-cli-win32-x64": "0.5.0-beta.1"
+    "@sylphai/adal-cli-darwin-arm64": "0.5.0-beta.3",
+    "@sylphai/adal-cli-darwin-x64": "0.5.0-beta.3",
+    "@sylphai/adal-cli-linux-x64": "0.5.0-beta.3",
+    "@sylphai/adal-cli-win32-x64": "0.5.0-beta.3"
   },
   "files": [
     "bin/",