@learnrudi/cli 1.9.7 → 1.9.8

package/dist/packages-manifest.json

@@ -0,0 +1,189 @@
+{
+  "version": "1.0.0",
+  "generated": "2026-01-09T15:24:13.250Z",
+  "packages": {
+    "runtimes": [
+      {
+        "id": "bun",
+        "name": "Bun",
+        "kind": "runtime",
+        "installDir": "bun",
+        "basePath": "runtimes",
+        "installType": "binary",
+        "commands": [
+          {
+            "name": "bun",
+            "bin": "bun",
+            "args": null
+          },
+          {
+            "name": "bunx",
+            "bin": "bun",
+            "args": [
+              "x"
+            ]
+          }
+        ]
+      },
+      {
+        "id": "deno",
+        "name": "Deno",
+        "kind": "runtime",
+        "installDir": "deno",
+        "basePath": "runtimes",
+        "installType": "binary",
+        "commands": [
+          {
+            "name": "deno",
+            "bin": "deno",
+            "args": null
+          }
+        ]
+      },
+      {
+        "id": "node",
+        "name": "Node.js",
+        "kind": "runtime",
+        "installDir": "node",
+        "basePath": "runtimes",
+        "installType": "binary",
+        "commands": [
+          {
+            "name": "node",
+            "bin": "bin/node",
+            "args": null
+          },
+          {
+            "name": "npm",
+            "bin": "bin/npm",
+            "args": null
+          },
+          {
+            "name": "npx",
+            "bin": "bin/npx",
+            "args": null
+          }
+        ]
+      },
+      {
+        "id": "python",
+        "name": "Python",
+        "kind": "runtime",
+        "installDir": "python",
+        "basePath": "runtimes",
+        "installType": "binary",
+        "commands": [
+          {
+            "name": "python",
+            "bin": "bin/python3",
+            "args": null
+          },
+          {
+            "name": "python3",
+            "bin": "bin/python3",
+            "args": null
+          },
+          {
+            "name": "pip",
+            "bin": "bin/python3",
+            "args": [
+              "-m",
+              "pip"
+            ]
+          },
+          {
+            "name": "pip3",
+            "bin": "bin/python3",
+            "args": [
+              "-m",
+              "pip"
+            ]
+          }
+        ]
+      }
+    ],
+    "agents": [
+      {
+        "id": "claude",
+        "name": "Claude Code",
+        "kind": "agent",
+        "installDir": "claude",
+        "basePath": "agents",
+        "installType": "npm",
+        "commands": [
+          {
+            "name": "claude",
+            "bin": "node_modules/.bin/claude",
+            "args": null
+          }
+        ]
+      },
+      {
+        "id": "codex",
+        "name": "OpenAI Codex",
+        "kind": "agent",
+        "installDir": "codex",
+        "basePath": "agents",
+        "installType": "npm",
+        "commands": [
+          {
+            "name": "codex",
+            "bin": "node_modules/.bin/codex",
+            "args": null
+          }
+        ]
+      },
+      {
+        "id": "copilot",
+        "name": "GitHub Copilot",
+        "kind": "agent",
+        "installDir": "copilot",
+        "basePath": "agents",
+        "installType": "npm",
+        "commands": [
+          {
+            "name": "copilot",
+            "bin": "node_modules/.bin/github-copilot-cli",
+            "args": null
+          },
+          {
+            "name": "github-copilot-cli",
+            "bin": "node_modules/.bin/github-copilot-cli",
+            "args": null
+          }
+        ]
+      },
+      {
+        "id": "gemini",
+        "name": "Gemini CLI",
+        "kind": "agent",
+        "installDir": "gemini",
+        "basePath": "agents",
+        "installType": "npm",
+        "commands": [
+          {
+            "name": "gemini",
+            "bin": "node_modules/.bin/gemini",
+            "args": null
+          }
+        ]
+      },
+      {
+        "id": "ollama",
+        "name": "Ollama",
+        "kind": "agent",
+        "installDir": "ollama",
+        "basePath": "agents",
+        "installType": "binary",
+        "commands": [
+          {
+            "name": "ollama",
+            "bin": "ollama",
+            "args": null
+          }
+        ]
+      }
+    ],
+    "binaries": []
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@learnrudi/cli",
-  "version": "1.9.7",
+  "version": "1.9.8",
   "description": "RUDI CLI - Install and manage MCP stacks, runtimes, and AI agents",
   "type": "module",
   "main": "dist/index.cjs",
@@ -14,7 +14,8 @@
   ],
   "scripts": {
     "start": "node src/index.js",
-    "build": "esbuild src/index.js --bundle --platform=node --format=cjs --outfile=dist/index.cjs --external:better-sqlite3 --external:@learnrudi/core --external:@learnrudi/db --external:@learnrudi/env --external:@learnrudi/manifest --external:@learnrudi/mcp --external:@learnrudi/registry-client --external:@learnrudi/runner --external:@learnrudi/secrets --external:@learnrudi/utils && cp src/router-mcp.js dist/router-mcp.js",
+    "prebuild": "node scripts/generate-manifest.js",
+    "build": "esbuild src/index.js --bundle --platform=node --format=cjs --outfile=dist/index.cjs --external:better-sqlite3 && cp src/router-mcp.js dist/router-mcp.js && cp src/packages-manifest.json dist/packages-manifest.json",
     "postinstall": "node scripts/postinstall.js",
     "prepublishOnly": "npm run build",
     "test": "node --test src/__tests__/"
@@ -28,7 +29,8 @@
     "@learnrudi/registry-client": "^1.0.0",
     "@learnrudi/runner": "^1.0.0",
     "@learnrudi/secrets": "^1.0.0",
-    "@learnrudi/utils": "^1.0.0"
+    "@learnrudi/utils": "^1.0.0",
+    "better-sqlite3": "^12.5.0"
   },
   "devDependencies": {
     "esbuild": "^0.27.2"

package/scripts/generate-manifest.js

@@ -0,0 +1,195 @@
+#!/usr/bin/env node
+/**
+ * Generate packages-manifest.json from registry catalog
+ *
+ * This script reads all package definitions from the registry catalog
+ * and generates a unified manifest for shim generation.
+ *
+ * Run at build time: node scripts/generate-manifest.js
+ * Output: src/packages-manifest.json (bundled with CLI)
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// Registry catalog paths - relative to CLI or absolute
+const REGISTRY_PATHS = [
+  path.resolve(__dirname, '../../registry/catalog'),  // Monorepo structure
+  path.resolve(__dirname, '../../../registry/catalog'), // Alternative layout
+];
+
+function findRegistryPath() {
+  for (const p of REGISTRY_PATHS) {
+    if (fs.existsSync(p)) {
+      return p;
+    }
+  }
+  throw new Error(`Registry catalog not found. Tried: ${REGISTRY_PATHS.join(', ')}`);
+}
+
+/**
+ * Read all JSON files from a directory
+ */
+function readCatalogDir(dirPath) {
+  if (!fs.existsSync(dirPath)) {
+    return [];
+  }
+
+  const files = fs.readdirSync(dirPath).filter(f => f.endsWith('.json'));
+  return files.map(f => {
+    const content = fs.readFileSync(path.join(dirPath, f), 'utf-8');
+    return JSON.parse(content);
+  });
+}
+
+/**
+ * Extract commands from a package definition
+ * Handles multiple formats:
+ * - commands: [{ name, bin, args? }] - new explicit format
+ * - binary: "name" - single binary
+ * - binaries: ["a", "b"] - multiple binaries with same name
+ */
+function extractCommands(pkg, kind) {
+  // New format: explicit commands array
+  if (pkg.commands && Array.isArray(pkg.commands)) {
+    return pkg.commands.map(cmd => ({
+      name: cmd.name,
+      bin: cmd.bin,
+      args: cmd.args || null,
+    }));
+  }
+
+  // Legacy format: binaries array (ffmpeg has ["ffmpeg", "ffprobe"])
+  if (pkg.binaries && Array.isArray(pkg.binaries)) {
+    return pkg.binaries.map(name => ({
+      name,
+      bin: name,
+      args: null,
+    }));
+  }
+
+  // Legacy format: single binary field
+  if (pkg.binary) {
+    const id = pkg.id.replace(/^(runtime|binary|agent):/, '');
+    return [{
+      name: id,
+      bin: pkg.binary,
+      args: null,
+    }];
+  }
+
+  // Fallback: use id as command name
+  const id = pkg.id.replace(/^(runtime|binary|agent):/, '');
+  return [{
+    name: id,
+    bin: id,
+    args: null,
+  }];
+}
+
+/**
+ * Get install directory for a package
+ */
+function getInstallDir(pkg, kind) {
+  if (pkg.installDir) {
+    return pkg.installDir;
+  }
+  const id = pkg.id.replace(/^(runtime|binary|agent):/, '');
+  return id;
+}
+
+/**
+ * Get the base path where this kind of package is installed
+ */
+function getKindBasePath(kind) {
+  switch (kind) {
+    case 'runtime': return 'runtimes';
+    case 'agent': return 'agents';
+    case 'binary': return 'binaries';
+    default: return kind + 's';
+  }
+}
+
+/**
+ * Process packages from a catalog directory
+ */
+function processPackages(catalogPath, kind) {
+  const dirPath = path.join(catalogPath, kind + 's'); // runtimes, agents, binaries
+  const packages = readCatalogDir(dirPath);
+
+  return packages.map(pkg => {
+    const id = pkg.id.replace(/^(runtime|binary|agent):/, '');
+    const installDir = getInstallDir(pkg, kind);
+    const basePath = getKindBasePath(kind);
+
+    return {
+      id,
+      name: pkg.name,
+      kind,
+      installDir,
+      basePath,
+      installType: pkg.installType || 'binary',
+      commands: extractCommands(pkg, kind),
+    };
+  });
+}
+
+/**
+ * Generate the manifest
+ */
+function generateManifest() {
+  const catalogPath = findRegistryPath();
+  console.log(`Reading catalog from: ${catalogPath}`);
+
+  const manifest = {
+    version: '1.0.0',
+    generated: new Date().toISOString(),
+    packages: {
+      runtimes: processPackages(catalogPath, 'runtime'),
+      agents: processPackages(catalogPath, 'agent'),
+      binaries: processPackages(catalogPath, 'binary'),
+    },
+  };
+
+  // Summary
+  const counts = {
+    runtimes: manifest.packages.runtimes.length,
+    agents: manifest.packages.agents.length,
+    binaries: manifest.packages.binaries.length,
+  };
+  console.log(`Found: ${counts.runtimes} runtimes, ${counts.agents} agents, ${counts.binaries} binaries`);
+
+  // Count total commands
+  let totalCommands = 0;
+  for (const kind of Object.values(manifest.packages)) {
+    for (const pkg of kind) {
+      totalCommands += pkg.commands.length;
+    }
+  }
+  console.log(`Total commands: ${totalCommands}`);
+
+  return manifest;
+}
+
+/**
+ * Main
+ */
+function main() {
+  try {
+    const manifest = generateManifest();
+
+    // Write to src directory (will be bundled with CLI)
+    const outputPath = path.resolve(__dirname, '../src/packages-manifest.json');
+    fs.writeFileSync(outputPath, JSON.stringify(manifest, null, 2));
+    console.log(`\nWrote manifest to: ${outputPath}`);
+
+  } catch (err) {
+    console.error('Error generating manifest:', err.message);
+    process.exit(1);
+  }
+}
+
+main();

package/scripts/postinstall.js

@@ -19,6 +19,9 @@ const RUDI_JSON_PATH = path.join(RUDI_HOME, 'rudi.json');
 const RUDI_JSON_TMP = path.join(RUDI_HOME, 'rudi.json.tmp');
 const REGISTRY_BASE = 'https://raw.githubusercontent.com/learn-rudi/registry/main';
 
+// Use 'bins' (consistent with @learnrudi/env) not 'shims'
+const BINS_DIR = path.join(RUDI_HOME, 'bins');
+
 // =============================================================================
 // RUDI.JSON CONFIG MANAGEMENT
 // =============================================================================
@@ -162,8 +165,10 @@ function ensureDirectories() {
     path.join(RUDI_HOME, 'runtimes'),
     path.join(RUDI_HOME, 'stacks'),
     path.join(RUDI_HOME, 'binaries'),
-    path.join(RUDI_HOME, 'shims'),
+    path.join(RUDI_HOME, 'agents'),
+    BINS_DIR,  // Use bins/ (consistent with @learnrudi/env)
     path.join(RUDI_HOME, 'cache'),
+    path.join(RUDI_HOME, 'router'),
   ];
 
   for (const dir of dirs) {
@@ -251,46 +256,171 @@ async function downloadRuntime(runtimeId, platformArch) {
   }
 }
 
-// Create all shims
+// =============================================================================
+// SHIM GENERATION
+// =============================================================================
+
+/**
+ * Load packages manifest (generated at build time from registry catalog)
+ * Falls back to empty manifest if not found
+ */
+function loadPackagesManifest() {
+  const possiblePaths = [
+    // When running from npm install (dist directory)
+    path.join(path.dirname(process.argv[1]), '..', 'dist', 'packages-manifest.json'),
+    // When running from source/dev
+    path.join(path.dirname(process.argv[1]), '..', 'src', 'packages-manifest.json'),
+  ];
+
+  for (const manifestPath of possiblePaths) {
+    try {
+      if (fs.existsSync(manifestPath)) {
+        const content = fs.readFileSync(manifestPath, 'utf-8');
+        return JSON.parse(content);
+      }
+    } catch {
+      // Try next path
+    }
+  }
+
+  console.log('  ⚠ packages-manifest.json not found, using minimal shims');
+  return { packages: { runtimes: [], agents: [], binaries: [] } };
+}
+
+/**
+ * Build a shim script that executes a target binary
+ * Shows helpful error if binary not installed
+ */
+function buildExecShim(targetPath, notInstalledMessage) {
+  const target = targetPath.replace(/"/g, '\\"');
+  const message = notInstalledMessage.replace(/"/g, '\\"');
+  return `#!/bin/sh
+TARGET="${target}"
+if [ ! -x "$TARGET" ]; then
+  echo "RUDI: ${message}" 1>&2
+  exit 127
+fi
+exec "$TARGET" "$@"
+`;
+}
+
+/**
+ * Build a shim script that runs a binary with extra args prepended
+ * Used for things like "pip" which runs "python3 -m pip"
+ */
+function buildArgsShim(targetPath, args, notInstalledMessage) {
+  const target = targetPath.replace(/"/g, '\\"');
+  const argsStr = args.map(a => `"${a.replace(/"/g, '\\"')}"`).join(' ');
+  const message = notInstalledMessage.replace(/"/g, '\\"');
+  return `#!/bin/sh
+TARGET="${target}"
+if [ ! -x "$TARGET" ]; then
+  echo "RUDI: ${message}" 1>&2
+  exit 127
+fi
+exec "$TARGET" ${argsStr} "$@"
+`;
+}
+
+/**
+ * Create all shims for runtimes, agents, and binaries
+ * Reads from packages-manifest.json (generated from registry catalog)
+ */
 function createShims() {
-  // Legacy shim for direct stack access: rudi-mcp <stack>
-  const mcpShimPath = path.join(RUDI_HOME, 'shims', 'rudi-mcp');
-  const mcpShimContent = `#!/bin/bash
+  const platform = process.platform;
+  const isWindows = platform === 'win32';
+
+  // Skip shim creation on Windows (uses different mechanism)
+  if (isWindows) {
+    console.log(`  ⚠ Shim creation skipped on Windows`);
+    return;
+  }
+
+  const manifest = loadPackagesManifest();
+  const shimDefs = [];
+
+  // ---------------------------------------------------------------------------
+  // GENERATE SHIMS FROM MANIFEST
+  // ---------------------------------------------------------------------------
+
+  const allPackages = [
+    ...manifest.packages.runtimes,
+    ...manifest.packages.agents,
+    ...manifest.packages.binaries,
+  ];
+
+  for (const pkg of allPackages) {
+    const installPath = path.join(RUDI_HOME, pkg.basePath, pkg.installDir);
+    const notInstalledMsg = `${pkg.name} is not installed. Run: rudi install ${pkg.kind}:${pkg.id}`;
+
+    for (const cmd of pkg.commands) {
+      const binPath = path.join(installPath, cmd.bin);
+
+      if (cmd.args && cmd.args.length > 0) {
+        // Command with prepended args (like pip -> python3 -m pip)
+        shimDefs.push({
+          name: cmd.name,
+          script: buildArgsShim(binPath, cmd.args, notInstalledMsg),
+        });
+      } else {
+        // Simple exec shim
+        shimDefs.push({
+          name: cmd.name,
+          script: buildExecShim(binPath, notInstalledMsg),
+        });
+      }
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // RUDI SHIMS (router, mcp) - always included
+  // ---------------------------------------------------------------------------
+
+  // rudi-mcp shim for direct stack access
+  shimDefs.push({
+    name: 'rudi-mcp',
+    script: `#!/bin/bash
 # RUDI MCP Shim - Routes agent calls to rudi mcp command
 # Usage: rudi-mcp <stack-name>
 exec rudi mcp "$@"
-`;
-  fs.writeFileSync(mcpShimPath, mcpShimContent);
-  fs.chmodSync(mcpShimPath, 0o755);
-  console.log(`  ✓ Created rudi-mcp shim`);
+`
+  });
 
-  // New router shim: Master MCP server that aggregates all stacks
-  const routerShimPath = path.join(RUDI_HOME, 'shims', 'rudi-router');
-  const routerShimContent = `#!/bin/bash
+  // rudi-router shim for aggregated MCP server
+  shimDefs.push({
+    name: 'rudi-router',
+    script: `#!/bin/bash
 # RUDI Router - Master MCP server for all installed stacks
 # Reads ~/.rudi/rudi.json and proxies tool calls to correct stack
-# Usage: Point agent config to this shim (no args needed)
-
 RUDI_HOME="$HOME/.rudi"
-
-# Use bundled Node if available
 if [ -x "$RUDI_HOME/runtimes/node/bin/node" ]; then
   exec "$RUDI_HOME/runtimes/node/bin/node" "$RUDI_HOME/router/router-mcp.js" "$@"
 else
   exec node "$RUDI_HOME/router/router-mcp.js" "$@"
 fi
-`;
-  fs.writeFileSync(routerShimPath, routerShimContent);
-  fs.chmodSync(routerShimPath, 0o755);
-  console.log(`  ✓ Created rudi-router shim`);
-
-  // Create router directory for the router-mcp.js file
-  const routerDir = path.join(RUDI_HOME, 'router');
-  if (!fs.existsSync(routerDir)) {
-    fs.mkdirSync(routerDir, { recursive: true });
+`
+  });
+
+  // ---------------------------------------------------------------------------
+  // WRITE ALL SHIMS
+  // ---------------------------------------------------------------------------
+
+  let created = 0;
+  for (const { name, script } of shimDefs) {
+    const shimPath = path.join(BINS_DIR, name);
+    fs.writeFileSync(shimPath, script, { encoding: 'utf-8' });
+    fs.chmodSync(shimPath, 0o755);
+    created++;
   }
 
+  console.log(`  ✓ Created ${created} shims in ~/.rudi/bins/`);
+
+  // ---------------------------------------------------------------------------
+  // ROUTER SETUP
+  // ---------------------------------------------------------------------------
+
   // Create package.json for ES module support
+  const routerDir = path.join(RUDI_HOME, 'router');
   const routerPackageJson = path.join(routerDir, 'package.json');
   fs.writeFileSync(routerPackageJson, JSON.stringify({
     name: 'rudi-router',