fraim 2.0.308 → 2.0.310

package/dist/src/cli/utils/managed-agent-install.js

@@ -5,7 +5,94 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installManagedAgent = installManagedAgent;
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const managed_agent_paths_1 = require("./managed-agent-paths");
+function errorMessage(error) {
+    return error instanceof Error ? error.message : 'Unknown error';
+}
+function isStaleNpmInstallError(error) {
+    const code = typeof error === 'object' && error !== null && 'code' in error
+        ? String(error.code || '')
+        : '';
+    const message = errorMessage(error).toLowerCase();
+    return code === 'EEXIST'
+        || message.includes('eexist')
+        || message.includes('already exists')
+        || message.includes('already in use');
+}
+function packagePathSegments(installPackage) {
+    let packageName = installPackage.trim();
+    if (!packageName)
+        return [];
+    if (packageName.startsWith('@')) {
+        const slashIndex = packageName.indexOf('/');
+        if (slashIndex === -1)
+            return [];
+        const versionAt = packageName.indexOf('@', slashIndex);
+        if (versionAt !== -1)
+            packageName = packageName.slice(0, versionAt);
+    }
+    else {
+        const versionAt = packageName.lastIndexOf('@');
+        if (versionAt > 0)
+            packageName = packageName.slice(0, versionAt);
+    }
+    const segments = packageName.split('/');
+    return segments.every((segment) => segment && segment !== '.' && segment !== '..' && !segment.includes('\\'))
+        ? segments
+        : [];
+}
+function isInsideDirectory(parentDir, candidate) {
+    const relative = path_1.default.relative(path_1.default.resolve(parentDir), path_1.default.resolve(candidate));
+    return !!relative && !relative.startsWith('..') && !path_1.default.isAbsolute(relative);
+}
+function managedShimNames(command) {
+    return process.platform === 'win32'
+        ? [command, `${command}.cmd`, `${command}.ps1`]
+        : [command];
+}
+function cleanupManagedInstallArtifacts(option, prefix) {
+    const resolvedPrefix = path_1.default.resolve(prefix);
+    const packageSegments = packagePathSegments(option.installPackage);
+    const candidates = new Set();
+    if (packageSegments.length > 0) {
+        candidates.add(path_1.default.join(resolvedPrefix, 'node_modules', ...packageSegments));
+        candidates.add(path_1.default.join(resolvedPrefix, 'lib', 'node_modules', ...packageSegments));
+    }
+    for (const shimName of managedShimNames(option.launchCommand)) {
+        candidates.add(path_1.default.join(resolvedPrefix, shimName));
+        candidates.add(path_1.default.join(resolvedPrefix, 'bin', shimName));
+    }
+    const removed = [];
+    for (const candidate of candidates) {
+        if (!isInsideDirectory(resolvedPrefix, candidate) || !fs_1.default.existsSync(candidate))
+            continue;
+        fs_1.default.rmSync(candidate, { recursive: true, force: true });
+        removed.push(candidate);
+    }
+    return removed;
+}
+async function runInstallWithStaleCleanupRetry(option, prefix, runInstall) {
+    try {
+        await runInstall();
+        return;
+    }
+    catch (error) {
+        if (!isStaleNpmInstallError(error))
+            throw error;
+        const removed = cleanupManagedInstallArtifacts(option, prefix);
+        try {
+            await runInstall();
+        }
+        catch (retryError) {
+            const cleanupSummary = removed.length > 0
+                ? ` Removed stale managed artifacts: ${removed.join(', ')}.`
+                : ' No matching stale managed artifacts were found to remove.';
+            throw new Error(`${option.label} install hit a stale npm artifact (${errorMessage(error)}).`
+                + `${cleanupSummary} Retry failed: ${errorMessage(retryError)}`);
+        }
+    }
+}
 // Issue #1284/#1285 (Implementation Strategy §2): the exact "standard npm
 // global install, then fall back to FRAIM's managed prefix" sequence used to
 // be duplicated verbatim in `server.ts` (Hub's install-agent route) and
@@ -17,6 +104,7 @@ const managed_agent_paths_1 = require("./managed-agent-paths");
 // check before invoking this — it only covers the install-then-fallback path.
 async function installManagedAgent(option, systemPath, deps) {
     let standardInstallError = null;
+    const prefix = (0, managed_agent_paths_1.getPortableNodeBinPath)();
     try {
         await deps.runProcess('npm', ['install', '-g', option.installPackage], {
             PATH: systemPath,
@@ -40,13 +128,14 @@ async function installManagedAgent(option, systemPath, deps) {
         standardInstallError = `${option.label} standard install completed, but the CLI is not runnable from the user PATH.`;
     }
     catch (error) {
-        standardInstallError = error instanceof Error ? error.message : 'Unknown error';
+        if (isStaleNpmInstallError(error))
+            cleanupManagedInstallArtifacts(option, prefix);
+        standardInstallError = errorMessage(error);
     }
     // Defect A fix: co-locate npm-global shims with the node.exe/npm.cmd that
     // actually runs the install, instead of the flat legacy directory.
-    const prefix = (0, managed_agent_paths_1.getPortableNodeBinPath)();
     fs_1.default.mkdirSync(prefix, { recursive: true });
-    await deps.runProcess('npm', ['install', '-g', option.installPackage], { npm_config_prefix: prefix });
+    await runInstallWithStaleCleanupRetry(option, prefix, () => deps.runProcess('npm', ['install', '-g', option.installPackage], { npm_config_prefix: prefix }).then(() => undefined));
     const ver = deps.commandVersion(option.launchCommand, (0, managed_agent_paths_1.getManagedAgentBinDirs)());
     if (!ver) {
         throw new Error(`${option.label} install completed, but the CLI is not runnable from FRAIM's managed PATH. Standard install failure: ${standardInstallError}`);

package/dist/src/first-run/session-service.js

@@ -647,6 +647,7 @@ class FirstRunSessionService {
     async runNodeRow() {
         const row = this.getRow('node');
         if (this.embeddedDesktop) {
+            persistShellPath(this.embeddedDesktop);
             row.status = 'ok';
             row.verb = `${process.version} bundled with FRAIM`;
             this.persist();
@@ -656,6 +657,7 @@ class FirstRunSessionService {
         // If node is missing here something is severely wrong; fall through to error.
         const ver = commandVersion('node');
         if (ver) {
+            persistShellPath(this.embeddedDesktop);
             row.status = 'ok';
             row.verb = `${ver} installed`;
             this.persist();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.308",
+  "version": "2.0.310",
   "description": "FRAIM core CLI and MCP package.",
   "main": "index.js",
   "bin": {