@openagents-org/agent-launcher 0.2.44 → 0.2.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/index.js +8 -0
- package/src/installer.js +28 -3
package/package.json
CHANGED
package/src/index.js
CHANGED
|
@@ -32,12 +32,20 @@ class AgentConnector {
|
|
|
32
32
|
|
|
33
33
|
async getCatalog() {
|
|
34
34
|
const catalog = await this.registry.getCatalog();
|
|
35
|
+
// Always re-check installed status (don't trust cached value)
|
|
35
36
|
return catalog.map((entry) => ({
|
|
36
37
|
...entry,
|
|
37
38
|
installed: this.installer.isInstalled(entry.name),
|
|
38
39
|
}));
|
|
39
40
|
}
|
|
40
41
|
|
|
42
|
+
/**
|
|
43
|
+
* Clear catalog cache so next getCatalog re-checks installed status.
|
|
44
|
+
*/
|
|
45
|
+
clearCatalogCache() {
|
|
46
|
+
this.registry._catalog = null;
|
|
47
|
+
}
|
|
48
|
+
|
|
41
49
|
getEnvFields(agentType) {
|
|
42
50
|
return this.registry.getEnvFields(agentType);
|
|
43
51
|
}
|
package/src/installer.js
CHANGED
|
@@ -36,10 +36,34 @@ class Installer {
|
|
|
36
36
|
* Checks binary on PATH first, then marker files.
|
|
37
37
|
*/
|
|
38
38
|
isInstalled(agentType) {
|
|
39
|
-
// Fast check: marker file
|
|
39
|
+
// Fast check: marker file
|
|
40
40
|
if (this._hasMarker(agentType)) return true;
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
|
|
42
|
+
// Check if binary exists on PATH
|
|
43
|
+
const binaryPath = this._whichBinary(agentType);
|
|
44
|
+
if (!binaryPath) return false;
|
|
45
|
+
|
|
46
|
+
// Verify it's not a stale shim — check the actual package exists
|
|
47
|
+
// npm shims point to node_modules/<pkg>/ — if the package dir is gone, the shim is stale
|
|
48
|
+
const entry = this.registry.getEntry(agentType);
|
|
49
|
+
const npmPkg = entry && entry.install ? entry.install.npm_package : null;
|
|
50
|
+
const binary = entry && entry.install ? entry.install.binary : agentType;
|
|
51
|
+
const portableDir = path.join(os.homedir(), '.openagents', 'nodejs');
|
|
52
|
+
const globalModules = path.join(portableDir, 'node_modules');
|
|
53
|
+
|
|
54
|
+
// If the binary is in our portable dir, verify the package exists
|
|
55
|
+
if (binaryPath.startsWith(portableDir)) {
|
|
56
|
+
const pkgDir = path.join(globalModules, npmPkg || binary);
|
|
57
|
+
if (!fs.existsSync(path.join(pkgDir, 'package.json'))) {
|
|
58
|
+
// Stale shim — clean it up
|
|
59
|
+
for (const ext of ['', '.cmd', '.ps1']) {
|
|
60
|
+
try { const p = path.join(portableDir, binary + ext); if (fs.existsSync(p)) fs.unlinkSync(p); } catch {}
|
|
61
|
+
}
|
|
62
|
+
return false;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
return true;
|
|
43
67
|
}
|
|
44
68
|
|
|
45
69
|
/**
|
|
@@ -295,6 +319,7 @@ class Installer {
|
|
|
295
319
|
proc.on('close', (code) => {
|
|
296
320
|
if (code === 0) {
|
|
297
321
|
this._markUninstalled(agentType);
|
|
322
|
+
this._cleanStaleShims(agentType);
|
|
298
323
|
if (onData) onData(`\nDone! ${agentType} has been uninstalled.\n`);
|
|
299
324
|
resolve({ success: true, command: cmd });
|
|
300
325
|
} else {
|