@plexor-dev/claude-code-plugin-staging 0.1.0-beta.23 → 0.1.0-beta.24

package/commands/plexor-setup.js

@@ -92,6 +92,32 @@ function getGatewayLabel(apiUrl) {
   return apiUrl.includes('staging') ? 'staging' : 'production';
 }
 
+function isRunningInsideClaudeSession(env = process.env) {
+  return Boolean(env.CLAUDECODE);
+}
+
+function createSkipVerifyResult() {
+  return { ok: true, reason: '', stdout: EXPECTED_VERIFY_RESPONSE, stderr: '', code: 0, pendingRestart: false };
+}
+
+function createPendingRestartVerifyResult() {
+  return {
+    ok: false,
+    reason: 'Restart Claude to finish Plexor activation in your current session.',
+    stdout: '',
+    stderr: '',
+    code: 0,
+    pendingRestart: true
+  };
+}
+
+function getVerifyLabel(verifyResult) {
+  if (verifyResult.pendingRestart) {
+    return 'Restart Claude';
+  }
+  return verifyResult.ok ? 'OK' : 'FAILED';
+}
+
 function updateHealth(config, state) {
   config.health = {
     installed: true,
@@ -102,6 +128,7 @@ function updateHealth(config, state) {
     verify_prompt: VERIFY_PROMPT,
     verify_expected: EXPECTED_VERIFY_RESPONSE,
     verify_error: state.verifyResult.ok ? null : state.verifyResult.reason,
+    activation_pending_restart: Boolean(state.verifyResult.pendingRestart),
     gateway: state.gateway,
     previous_auth_preserved: state.previousAuthPreserved
   };
@@ -124,10 +151,14 @@ function printReceipt({ user, gateway, previousAuthPreserved, verifyResult }) {
   console.log('├─────────────────────────────────────────────┤');
   console.log(line(`Connected: OK (${user.email || 'Unknown'})`));
   console.log(line(`Routing Active: OK (${gateway})`));
-  console.log(line(`Verified: ${verifyResult.ok ? 'OK' : 'FAILED'}`));
+  console.log(line(`Verified: ${getVerifyLabel(verifyResult)}`));
   console.log(line(`Previous Claude auth: ${previousAuthPreserved ? 'Saved' : 'None found'}`));
   console.log('├─────────────────────────────────────────────┤');
-  if (verifyResult.ok) {
+  if (verifyResult.pendingRestart) {
+    console.log(line('Plexor routing is configured'));
+    console.log(line('Restart Claude to activate Plexor'));
+    console.log(line('Then run /plexor-status'));
+  } else if (verifyResult.ok) {
     console.log(line('Plexor routing is configured'));
     console.log(line('Restart Claude, then send a prompt'));
     console.log(line('Logout/uninstall restores prior auth'));
@@ -221,9 +252,9 @@ async function main() {
     currentSettings.env?.PLEXOR_PREVIOUS_CLAUDE_PRIMARY_API_KEY
   );
 
-  const verifyResult = skipVerify
-    ? { ok: true, reason: '', stdout: EXPECTED_VERIFY_RESPONSE, stderr: '', code: 0 }
-    : runClaudeRouteVerification();
+  const verifyResult = isRunningInsideClaudeSession()
+    ? createPendingRestartVerifyResult()
+    : (skipVerify ? createSkipVerifyResult() : runClaudeRouteVerification());
 
   updateHealth(updatedConfig, {
     gateway: getGatewayLabel(apiUrl),
@@ -243,12 +274,22 @@ async function main() {
     verifyResult
   });
 
-  if (!verifyResult.ok) {
+  if (!verifyResult.ok && !verifyResult.pendingRestart) {
     process.exit(1);
   }
 }
 
-main().catch((err) => {
-  console.error(`Error: ${err.message}`);
-  process.exit(1);
-});
+if (require.main === module) {
+  main().catch((err) => {
+    console.error(`Error: ${err.message}`);
+    process.exit(1);
+  });
+} else {
+  module.exports = {
+    createPendingRestartVerifyResult,
+    createSkipVerifyResult,
+    getVerifyLabel,
+    isRunningInsideClaudeSession,
+    updateHealth
+  };
+}

package/commands/plexor-status.js

@@ -172,6 +172,47 @@ function loadConfig() {
   }
 }
 
+function saveConfig(config) {
+  try {
+    const configDir = path.dirname(CONFIG_PATH);
+    if (!fs.existsSync(configDir)) {
+      fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
+    }
+    const tempPath = path.join(configDir, `.config.${Date.now()}.tmp`);
+    fs.writeFileSync(tempPath, JSON.stringify(config, null, 2), { mode: 0o600 });
+    fs.renameSync(tempPath, CONFIG_PATH);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function isActivationPendingRestart(verification = {}) {
+  return verification.activation_pending_restart === true;
+}
+
+function shouldPromotePendingRestart(verification = {}, routing = {}, userFetchWorked = false) {
+  return isActivationPendingRestart(verification) && routing.active && userFetchWorked;
+}
+
+function getVerificationSummary(verification = {}, options = {}) {
+  const { routingActive = false, userFetchWorked = false } = options;
+
+  if (shouldPromotePendingRestart(verification, { active: routingActive }, userFetchWorked)) {
+    return { verified: 'OK', nextAction: '/plexor-status', shouldPromote: true };
+  }
+
+  if (isActivationPendingRestart(verification)) {
+    return { verified: 'Restart Claude', nextAction: 'Restart Claude', shouldPromote: false };
+  }
+
+  return {
+    verified: verification.verified ? 'OK' : (verification.verify_error ? 'Failed' : 'Not yet'),
+    nextAction: null,
+    shouldPromote: false
+  };
+}
+
 /**
  * Check for environment mismatch between config and routing
  */
@@ -385,12 +426,33 @@ ${line(`└── Cost saved: $${sessionCostSaved}`)}
   const envLabel = routing.isStaging ? '(staging)' : '(production)';
   const stateMismatch = checkStateMismatch(enabled, routing.active);
   const connectedState = userFetchWorked ? 'OK' : 'Unknown';
-  const verifiedState = verification.verified
+  const verificationSummary = getVerificationSummary(verification, {
+    routingActive: routing.active,
+    userFetchWorked
+  });
+
+  if (verificationSummary.shouldPromote) {
+    config.health = {
+      ...verification,
+      verified: true,
+      verified_at: new Date().toISOString(),
+      verify_error: null,
+      activation_pending_restart: false
+    };
+    saveConfig(config);
+    verification.verified = true;
+    verification.verified_at = config.health.verified_at;
+    verification.verify_error = null;
+    verification.activation_pending_restart = false;
+  }
+
+  const verifiedState = verificationSummary.shouldPromote
     ? 'OK'
-    : (verification.verify_error ? 'Failed' : 'Not yet');
-  const nextAction = !routing.active || partialState.partial || stateMismatch || !verification.verified
-    ? '/plexor-setup'
-    : '/plexor-status';
+    : verificationSummary.verified;
+  const nextAction = verificationSummary.nextAction ||
+    (!routing.active || partialState.partial || stateMismatch || !verification.verified
+      ? '/plexor-setup'
+      : '/plexor-status');
 
   // Note: Environment mismatch warning removed - it caused false positives during
   // concurrent operations and transient states. The partial state and config/routing
@@ -521,7 +583,15 @@ function fetchJson(apiUrl, endpoint, apiKey) {
   });
 }
 
-main().catch(err => {
-  console.error('Error:', err.message);
-  process.exit(1);
-});
+if (require.main === module) {
+  main().catch(err => {
+    console.error('Error:', err.message);
+    process.exit(1);
+  });
+} else {
+  module.exports = {
+    getVerificationSummary,
+    isActivationPendingRestart,
+    shouldPromotePendingRestart
+  };
+}

package/lib/plexor-client.js

@@ -31,7 +31,7 @@ class PlexorClient {
           'Content-Type': 'application/json',
           'X-API-Key': this.apiKey,
           'X-Plexor-Key': this.apiKey,
-          'User-Agent': 'plexor-claude-code-plugin/0.1.0-beta.23'
+          'User-Agent': 'plexor-claude-code-plugin/0.1.0-beta.24'
         },
         timeout: this.timeout
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plexor-dev/claude-code-plugin-staging",
-  "version": "0.1.0-beta.23",
+  "version": "0.1.0-beta.24",
   "description": "STAGING - LLM cost optimization plugin for Claude Code (internal testing)",
   "main": "lib/constants.js",
   "bin": {