@plexor-dev/claude-code-plugin-staging 0.1.0-beta.1 → 0.1.0-beta.11

package/lib/settings-manager.js

@@ -12,9 +12,12 @@
 
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
+const crypto = require('crypto');
 
 const CLAUDE_DIR = path.join(process.env.HOME || process.env.USERPROFILE || '', '.claude');
 const SETTINGS_PATH = path.join(CLAUDE_DIR, 'settings.json');
+const LOCK_TIMEOUT_MS = 5000; // 5 second lock timeout
 
 // Plexor gateway endpoints
 const PLEXOR_STAGING_URL = 'https://staging.api.plexor.dev/gateway/anthropic';
@@ -27,8 +30,8 @@ class ClaudeSettingsManager {
   }
 
   /**
-   * Load current Claude settings
-   * @returns {Object} settings object or empty object if not found
+   * Load current Claude settings with integrity checking
+   * @returns {Object} settings object or empty object if not found/corrupted
    */
   load() {
     try {
@@ -36,15 +39,84 @@ class ClaudeSettingsManager {
         return {};
       }
       const data = fs.readFileSync(this.settingsPath, 'utf8');
-      return JSON.parse(data);
+
+      // Check for empty file
+      if (!data || data.trim() === '') {
+        return {};
+      }
+
+      const parsed = JSON.parse(data);
+
+      // Basic schema validation - must be an object
+      if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+        const backupPath = this._backupCorruptedFile();
+        console.warn('');
+        console.warn('WARNING: Claude settings file has invalid format!');
+        if (backupPath) {
+          console.warn(`         Corrupted file backed up to: ${backupPath}`);
+        }
+        console.warn('         Using default settings. Your previous settings may need manual recovery.');
+        console.warn('');
+        return {};
+      }
+
+      return parsed;
     } catch (err) {
-      // Return empty object if file doesn't exist or parse error
+      if (err.code === 'ENOENT') {
+        return {};
+      }
+      // JSON parse error or corrupted file
+      if (err instanceof SyntaxError) {
+        const backupPath = this._backupCorruptedFile();
+        console.warn('');
+        console.warn('WARNING: Claude settings file is corrupted (invalid JSON)!');
+        if (backupPath) {
+          console.warn(`         Corrupted file backed up to: ${backupPath}`);
+        }
+        console.warn('         Using default settings. Your previous settings may need manual recovery.');
+        console.warn('');
+        return {};
+      }
+      // Permission error
+      if (err.code === 'EACCES' || err.code === 'EPERM') {
+        console.warn(`Warning: Cannot read ${this.settingsPath} (permission denied)`);
+        return {};
+      }
+      console.warn('Warning: Failed to load Claude settings:', err.message);
       return {};
     }
   }
 
   /**
-   * Save Claude settings
+   * Backup a corrupted settings file with numbered suffix for debugging
+   * Creates settings.json.corrupted.1, .corrupted.2, etc. to preserve history
+   * @returns {string|null} path to backup file, or null if backup failed
+   */
+  _backupCorruptedFile() {
+    try {
+      if (fs.existsSync(this.settingsPath)) {
+        // Find next available numbered backup
+        let backupNum = 1;
+        let backupPath;
+        while (true) {
+          backupPath = `${this.settingsPath}.corrupted.${backupNum}`;
+          if (!fs.existsSync(backupPath)) {
+            break;
+          }
+          backupNum++;
+        }
+        fs.copyFileSync(this.settingsPath, backupPath);
+        return backupPath;
+      }
+    } catch {
+      // Ignore backup errors silently
+    }
+    return null;
+  }
+
+  /**
+   * Save Claude settings using atomic write pattern
+   * Prevents race conditions by writing to temp file then renaming
    * @param {Object} settings - settings object to save
    * @returns {boolean} success status
    */
@@ -55,10 +127,27 @@ class ClaudeSettingsManager {
         fs.mkdirSync(this.claudeDir, { recursive: true });
       }
 
-      fs.writeFileSync(this.settingsPath, JSON.stringify(settings, null, 2));
+      // Atomic write: write to temp file, then rename
+      // This prevents race conditions where concurrent writes corrupt the file
+      const tempId = crypto.randomBytes(8).toString('hex');
+      const tempPath = path.join(this.claudeDir, `.settings.${tempId}.tmp`);
+
+      // Write to temp file
+      const content = JSON.stringify(settings, null, 2);
+      fs.writeFileSync(tempPath, content, { mode: 0o600 });
+
+      // Atomic rename (on POSIX systems, rename is atomic)
+      fs.renameSync(tempPath, this.settingsPath);
+
       return true;
     } catch (err) {
-      console.error('Failed to save Claude settings:', err.message);
+      // Clean error message for permission errors
+      if (err.code === 'EACCES' || err.code === 'EPERM') {
+        console.error(`Error: Cannot write to ${this.settingsPath}`);
+        console.error('       Check file permissions or run with appropriate access.');
+      } else {
+        console.error('Failed to save Claude settings:', err.message);
+      }
       return false;
     }
   }
@@ -177,6 +266,30 @@ class ClaudeSettingsManager {
     }
   }
 
+  /**
+   * Detect partial routing state where URL points to Plexor but auth is missing/invalid
+   * This can cause confusing auth errors for users
+   * @returns {Object} { partial: boolean, issue: string|null }
+   */
+  detectPartialState() {
+    try {
+      const settings = this.load();
+      const baseUrl = settings.env?.ANTHROPIC_BASE_URL || '';
+      const authToken = settings.env?.ANTHROPIC_AUTH_TOKEN || '';
+      const isPlexorUrl = baseUrl.includes('plexor') || baseUrl.includes('staging.api');
+
+      if (isPlexorUrl && !authToken) {
+        return { partial: true, issue: 'Plexor URL set but no auth token' };
+      }
+      if (isPlexorUrl && !authToken.startsWith('plx_')) {
+        return { partial: true, issue: 'Plexor URL set but auth token is not a Plexor key' };
+      }
+      return { partial: false, issue: null };
+    } catch {
+      return { partial: false, issue: null };
+    }
+  }
+
   /**
    * Update just the API key without changing other settings
    * @param {string} apiKey - new Plexor API key

package/package.json

@@ -1,17 +1,14 @@
 {
   "name": "@plexor-dev/claude-code-plugin-staging",
-  "version": "0.1.0-beta.1",
+  "version": "0.1.0-beta.11",
   "description": "STAGING - LLM cost optimization plugin for Claude Code (internal testing)",
   "main": "lib/constants.js",
   "bin": {
     "plexor-status": "./commands/plexor-status.js",
-    "plexor-mode": "./commands/plexor-mode.js",
     "plexor-enabled": "./commands/plexor-enabled.js",
-    "plexor-provider": "./commands/plexor-provider.js",
     "plexor-login": "./commands/plexor-login.js",
     "plexor-logout": "./commands/plexor-logout.js",
-    "plexor-settings": "./commands/plexor-settings.js",
-    "plexor-config": "./commands/plexor-config.js"
+    "plexor-uninstall": "./commands/plexor-uninstall.js"
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.js",

package/scripts/postinstall.js

@@ -70,12 +70,60 @@ function chownRecursive(dirPath, uid, gid) {
 
 const HOME_DIR = getHomeDir();
 const COMMANDS_SOURCE = path.join(__dirname, '..', 'commands');
+const LIB_SOURCE = path.join(__dirname, '..', 'lib');
 const CLAUDE_COMMANDS_DIR = path.join(HOME_DIR, '.claude', 'commands');
 const PLEXOR_PLUGINS_DIR = path.join(HOME_DIR, '.claude', 'plugins', 'plexor', 'commands');
+const PLEXOR_LIB_DIR = path.join(HOME_DIR, '.claude', 'plugins', 'plexor', 'lib');
 const PLEXOR_CONFIG_DIR = path.join(HOME_DIR, '.plexor');
 const PLEXOR_CONFIG_FILE = path.join(PLEXOR_CONFIG_DIR, 'config.json');
 
+/**
+ * Check for orphaned Plexor routing in settings.json without valid config.
+ * This can happen if a previous uninstall was incomplete.
+ */
+function checkOrphanedRouting() {
+  const home = process.env.HOME || process.env.USERPROFILE;
+  if (!home) return;
+
+  const settingsPath = path.join(home, '.claude', 'settings.json');
+  const configPath = path.join(home, '.plexor', 'config.json');
+
+  try {
+    if (!fs.existsSync(settingsPath)) return;
+
+    const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+    const env = settings.env || {};
+
+    const hasPlexorUrl = env.ANTHROPIC_BASE_URL &&
+                         env.ANTHROPIC_BASE_URL.includes('plexor');
+
+    if (hasPlexorUrl) {
+      // Check if there's a valid Plexor config
+      let hasValidConfig = false;
+      try {
+        if (fs.existsSync(configPath)) {
+          const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+          hasValidConfig = config.apiKey && config.apiKey.startsWith('plx_');
+        }
+      } catch (e) {}
+
+      if (!hasValidConfig) {
+        console.log('\n  Warning: Detected orphaned Plexor routing in Claude settings');
+        console.log('  This may be from a previous installation.\n');
+        console.log('  Run /plexor-login to reconfigure, or');
+        console.log('  Run /plexor-uninstall to clean up\n');
+      } else {
+        console.log('\n  Existing Plexor configuration detected');
+        console.log('  Your previous settings have been preserved.\n');
+      }
+    }
+  } catch (e) {
+    // Ignore errors in detection - don't break install
+  }
+}
+
 // Default configuration for new installs
+// STAGING PACKAGE - uses staging API
 const DEFAULT_CONFIG = {
   version: 1,
   auth: {
@@ -84,13 +132,16 @@ const DEFAULT_CONFIG = {
   },
   settings: {
     enabled: true,
-    apiUrl: "https://api.plexor.dev",
+    apiUrl: "https://staging.api.plexor.dev",
     mode: "balanced",
     localCacheEnabled: true
   }
 };
 
 function main() {
+  // Check for orphaned routing at start of postinstall
+  checkOrphanedRouting();
+
   try {
     // Get target user info for chown (if running with sudo)
     const targetUser = getTargetUserIds();
@@ -101,6 +152,9 @@ function main() {
     // Create ~/.claude/plugins/plexor/commands/ for JS executors
     fs.mkdirSync(PLEXOR_PLUGINS_DIR, { recursive: true });
 
+    // Create ~/.claude/plugins/plexor/lib/ for shared modules
+    fs.mkdirSync(PLEXOR_LIB_DIR, { recursive: true });
+
     // Create ~/.plexor/ with secure permissions (owner only)
     fs.mkdirSync(PLEXOR_CONFIG_DIR, { recursive: true, mode: 0o700 });
 
@@ -161,6 +215,40 @@ function main() {
       jsInstalled.push(file);
     }
 
+    // Copy lib files to ~/.claude/plugins/plexor/lib/
+    // CRITICAL: These are required for commands to work
+    const libInstalled = [];
+    if (fs.existsSync(LIB_SOURCE)) {
+      const libFiles = fs.readdirSync(LIB_SOURCE).filter(f => f.endsWith('.js'));
+      if (libFiles.length === 0) {
+        console.warn('  ⚠ Warning: No lib files found in package. Commands may not work.');
+      }
+      for (const file of libFiles) {
+        try {
+          const src = path.join(LIB_SOURCE, file);
+          const dest = path.join(PLEXOR_LIB_DIR, file);
+          fs.copyFileSync(src, dest);
+          libInstalled.push(file);
+        } catch (err) {
+          console.error(`  ✗ Failed to copy lib/${file}: ${err.message}`);
+        }
+      }
+    } else {
+      console.error('  ✗ CRITICAL: lib/ directory not found in package.');
+      console.error('    Commands will fail. Please reinstall the package.');
+      console.error(`    Expected location: ${LIB_SOURCE}`);
+    }
+
+    // Verify critical lib file exists
+    const criticalLibFile = path.join(PLEXOR_LIB_DIR, 'settings-manager.js');
+    if (!fs.existsSync(criticalLibFile)) {
+      console.error('');
+      console.error('  ✗ CRITICAL: settings-manager.js was not installed.');
+      console.error('    This file is required for commands to work.');
+      console.error('    Try reinstalling: npm install @plexor-dev/claude-code-plugin-staging');
+      console.error('');
+    }
+
     // Fix file ownership when running with sudo
     // Files are created as root but should be owned by the original user
     if (targetUser) {
@@ -190,7 +278,10 @@ function main() {
     }
     console.log(`  ✓ Installed ${installed.length} slash commands to ~/.claude/commands/`);
     if (jsInstalled.length > 0) {
-      console.log(`  ✓ Installed ${jsInstalled.length} executors to ~/.claude/plugins/plexor/`);
+      console.log(`  ✓ Installed ${jsInstalled.length} executors to ~/.claude/plugins/plexor/commands/`);
+    }
+    if (libInstalled.length > 0) {
+      console.log(`  ✓ Installed ${libInstalled.length} lib modules to ~/.claude/plugins/plexor/lib/`);
     }
     if (targetUser) {
       console.log(`  ✓ Set file ownership to ${targetUser.user}`);
@@ -218,10 +309,10 @@ function main() {
     console.log('  └─────────────────────────────────────────────────────────────────┘');
     console.log('');
     console.log('  Available commands:');
-    console.log('    /plexor-status   - Check connection and see savings');
-    console.log('    /plexor-mode     - Switch modes (eco/balanced/quality)');
+    console.log('    /plexor-setup    - First-time setup wizard');
     console.log('    /plexor-login    - Authenticate with API key');
-    console.log('    /plexor-settings - View/modify settings');
+    console.log('    /plexor-status   - Check connection and see savings');
+    console.log('    /plexor-enabled  - Enable/disable Plexor routing');
     console.log('');
     console.log('  Documentation: https://plexor.dev/docs');
     console.log('');

package/scripts/uninstall.js

@@ -1,67 +1,154 @@
 #!/usr/bin/env node
 
 /**
- * Plexor Claude Code Plugin - Uninstall Script
+ * Plexor Claude Code Plugin (Staging) - Comprehensive Uninstall Script
  *
- * Removes slash commands from ~/.claude/commands/
- * Optionally restores backups if they exist.
+ * Runs on npm uninstall (when npm actually calls it).
+ * Also callable directly: node scripts/uninstall.js
+ *
+ * Performs complete cleanup:
+ * 1. Removes Plexor routing from ~/.claude/settings.json
+ * 2. Removes slash command files from ~/.claude/commands/
+ * 3. Removes plugin directory from ~/.claude/plugins/plexor/
+ * 4. Restores any backups if they exist
  */
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 
-const COMMANDS_SOURCE = path.join(__dirname, '..', 'commands');
-const CLAUDE_COMMANDS_DIR = path.join(os.homedir(), '.claude', 'commands');
+// Get home directory - support both Unix and Windows
+const home = process.env.HOME || process.env.USERPROFILE;
+if (!home) {
+  console.log('Warning: HOME not set, skipping cleanup');
+  process.exit(0);
+}
+
+console.log('');
+console.log('  Plexor plugin cleanup...');
+console.log('');
+
+const results = {
+  routing: false,
+  commands: [],
+  restored: [],
+  pluginDir: false
+};
 
-function main() {
-  try {
-    // Get list of our command files
-    const files = fs.readdirSync(COMMANDS_SOURCE)
-      .filter(f => f.endsWith('.md'));
+// 1. Remove routing from settings.json
+// This is CRITICAL - do NOT depend on settings-manager module since it may not load during uninstall
+try {
+  const settingsPath = path.join(home, '.claude', 'settings.json');
+  if (fs.existsSync(settingsPath)) {
+    const data = fs.readFileSync(settingsPath, 'utf8');
+    if (data && data.trim()) {
+      const settings = JSON.parse(data);
+      if (settings.env) {
+        const hadBaseUrl = !!settings.env.ANTHROPIC_BASE_URL;
+        const hadAuthToken = !!settings.env.ANTHROPIC_AUTH_TOKEN;
+
+        delete settings.env.ANTHROPIC_BASE_URL;
+        delete settings.env.ANTHROPIC_AUTH_TOKEN;
+
+        // Clean up empty env block
+        if (Object.keys(settings.env).length === 0) {
+          delete settings.env;
+        }
+
+        if (hadBaseUrl || hadAuthToken) {
+          fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), { mode: 0o600 });
+          results.routing = true;
+        }
+      }
+    }
+  }
+} catch (e) {
+  console.log(`  Warning: Could not clean settings.json: ${e.message}`);
+}
 
-    const removed = [];
-    const restored = [];
+// 2. Remove slash command files
+// These are the Plexor-specific command files that get installed to ~/.claude/commands/
+const plexorCommands = [
+  'plexor-config.md',
+  'plexor-enabled.md',
+  'plexor-login.md',
+  'plexor-logout.md',
+  'plexor-mode.md',
+  'plexor-provider.md',
+  'plexor-settings.md',
+  'plexor-setup.md',
+  'plexor-status.md',
+  'plexor-uninstall.md'
+];
 
-    for (const file of files) {
-      const dest = path.join(CLAUDE_COMMANDS_DIR, file);
-      const backupPath = dest + '.backup';
+try {
+  const commandsDir = path.join(home, '.claude', 'commands');
+  if (fs.existsSync(commandsDir)) {
+    for (const cmd of plexorCommands) {
+      const cmdPath = path.join(commandsDir, cmd);
+      const backupPath = cmdPath + '.backup';
 
-      if (fs.existsSync(dest)) {
-        fs.unlinkSync(dest);
-        removed.push(file.replace('.md', ''));
+      if (fs.existsSync(cmdPath)) {
+        fs.unlinkSync(cmdPath);
+        results.commands.push(cmd.replace('.md', ''));
 
         // Restore backup if it exists
         if (fs.existsSync(backupPath)) {
-          fs.renameSync(backupPath, dest);
-          restored.push(file);
+          fs.renameSync(backupPath, cmdPath);
+          results.restored.push(cmd);
         }
       }
     }
+  }
+} catch (e) {
+  console.log(`  Warning: Could not clean commands: ${e.message}`);
+}
 
-    if (removed.length > 0) {
-      console.log('');
-      console.log('  Plexor plugin uninstalled');
-      console.log('');
-      console.log('  Removed commands:');
-      removed.forEach(cmd => console.log(`    /${cmd}`));
-
-      if (restored.length > 0) {
-        console.log('');
-        console.log('  Restored from backup:');
-        restored.forEach(f => console.log(`    ${f}`));
-      }
+// 3. Remove plugin directory
+try {
+  const pluginDir = path.join(home, '.claude', 'plugins', 'plexor');
+  if (fs.existsSync(pluginDir)) {
+    fs.rmSync(pluginDir, { recursive: true, force: true });
+    results.pluginDir = true;
+  }
+} catch (e) {
+  console.log(`  Warning: Could not remove plugin directory: ${e.message}`);
+}
 
-      console.log('');
-      console.log('  Note: ~/.plexor/ config directory was preserved.');
-      console.log('  To remove it: rm -rf ~/.plexor');
-      console.log('');
-    }
+// Output results
+if (results.routing || results.commands.length > 0 || results.pluginDir) {
+  console.log('  Plexor plugin uninstalled');
+  console.log('');
 
-  } catch (error) {
-    // Don't fail uninstall on errors - just warn
-    console.warn(`  Warning: Could not fully uninstall: ${error.message}`);
+  if (results.routing) {
+    console.log('  Removed Plexor routing from Claude settings');
+    console.log('    (Claude Code now connects directly to Anthropic)');
+    console.log('');
   }
+
+  if (results.commands.length > 0) {
+    console.log('  Removed commands:');
+    results.commands.forEach(cmd => console.log(`    /${cmd}`));
+    console.log('');
+  }
+
+  if (results.restored.length > 0) {
+    console.log('  Restored from backup:');
+    results.restored.forEach(f => console.log(`    ${f}`));
+    console.log('');
+  }
+
+  if (results.pluginDir) {
+    console.log('  Removed plugin directory');
+    console.log('');
+  }
+
+  console.log('  Note: ~/.plexor/ config directory was preserved.');
+  console.log('  To remove it: rm -rf ~/.plexor');
+  console.log('');
+} else {
+  console.log('  No Plexor components found to clean up.');
+  console.log('');
 }
 
-main();
+console.log('  Cleanup complete');
+console.log('');