@symbo.ls/cli 2.33.20 → 2.33.25

package/bin/collab.js

@@ -35,15 +35,15 @@ function debounce(fn, wait) {
 }
 
 export async function startCollab(options) {
+  const symbolsConfig = await loadSymbolsConfig()
+  const cliConfig = loadCliConfig()
   const credManager = new CredentialManager()
-  const authToken = credManager.ensureAuthToken()
+  const authToken = credManager.ensureAuthToken(cliConfig.apiBaseUrl)
   if (!authToken) {
     console.log(chalk.yellow('\nAuthentication required. Please run: smbls login\n'))
     process.exit(1)
   }
 
-  const symbolsConfig = await loadSymbolsConfig()
-  const cliConfig = loadCliConfig()
   const lock = readLock()
   const branch = options.branch || cliConfig.branch || symbolsConfig.branch || 'main'
   const appKey = cliConfig.projectKey || symbolsConfig.key

package/bin/fetch.js

@@ -26,17 +26,16 @@ const debugMsg = chalk.dim(
 export const fetchFromCli = async (opts) => {
   const { dev, verbose, prettify, convert: convertOpt, metadata: metadataOpt, update, force } = opts
 
+  const symbolsConfig = await loadSymbolsConfig()
+  const cliConfig = loadCliConfig()
   const credManager = new CredentialManager()
-  const authToken = credManager.ensureAuthToken()
+  const authToken = credManager.ensureAuthToken(cliConfig.apiBaseUrl)
 
   if (!authToken) {
     showAuthRequiredMessages()
-
     process.exit(1)
   }
 
-  const symbolsConfig = await loadSymbolsConfig()
-  const cliConfig = loadCliConfig()
   const projectKey = cliConfig.projectKey || symbolsConfig.key
   const branch = cliConfig.branch || symbolsConfig.branch || 'main'
   const { framework, distDir, metadata } = symbolsConfig

package/bin/index.js

@@ -14,6 +14,7 @@ import './login.js'
 import './push.js'
 import './link-packages.js'
 import './collab.js'
+import './servers.js'
 
 const args = process.argv
 program.parse(args)

package/bin/init-helpers/init-repo.js

@@ -48,14 +48,22 @@ export async function initRepo (dest, framework) {
   // Copy design system file
   console.log()
   const dsfilePath = path.join(dest, 'DesignSystem.js')
-  console.log('Creating', chalk.bold(dsfilePath))
-  await fs.promises.copyFile(DESIGN_SYSTEM_FILE_PATH, dsfilePath)
+  if (fs.existsSync(dsfilePath)) {
+    console.log(chalk.yellow('Skipping existing'), chalk.bold(dsfilePath))
+  } else {
+    console.log('Creating', chalk.bold(dsfilePath))
+    await fs.promises.copyFile(DESIGN_SYSTEM_FILE_PATH, dsfilePath)
+  }
 
   // Copy design system file
   const rcfilePath = path.join(dest, 'symbols.json')
-  console.log('Creating', chalk.bold(rcfilePath))
-  await fs.promises.copyFile(SYMBOLS_FILE_PATH, rcfilePath)
-  if (framework !== 'domql') addToJson(SYMBOLS_FILE_PATH, 'framework', framework)
+  if (fs.existsSync(rcfilePath)) {
+    console.log(chalk.yellow('Skipping existing'), chalk.bold(rcfilePath))
+  } else {
+    console.log('Creating', chalk.bold(rcfilePath))
+    await fs.promises.copyFile(SYMBOLS_FILE_PATH, rcfilePath)
+  }
+  if (framework !== 'domql') addToJson(rcfilePath, 'framework', framework)
   console.log()
 
   console.log(chalk.green.bold('Initialized project successfully.'))

package/bin/login.js

@@ -98,6 +98,7 @@ program
       // Save credentials
       const credManager = new CredentialManager()
       credManager.saveCredentials({
+        apiBaseUrl: answers.apiBaseUrl,
         authToken: token,
         refreshToken,
         authTokenExpiresAt: accessTokenExp,
@@ -105,7 +106,7 @@ program
         email: user?.email || answers.email
       })
 
-      // Persist API base URL to local config
+      // Persist API base URL to local config for this project as well
       saveCliConfig({ apiBaseUrl: answers.apiBaseUrl })
 
       console.log(chalk.green('\n✨ Successfully logged in!'))

package/bin/push.js

@@ -99,17 +99,17 @@ async function confirmChanges (changes, base, local) {
 
 export async function pushProjectChanges(options) {
   const { verbose, message, type = 'patch' } = options
-  const credManager = new CredentialManager()
-  const authToken = credManager.ensureAuthToken()
-
-  if (!authToken) {
-    showAuthRequiredMessages()
-    process.exit(1)
-  }
-
   try {
     const symbolsConfig = await loadSymbolsConfig()
     const cliConfig = loadCliConfig()
+    const credManager = new CredentialManager()
+    const authToken = credManager.ensureAuthToken(cliConfig.apiBaseUrl)
+
+    if (!authToken) {
+      showAuthRequiredMessages()
+      process.exit(1)
+    }
+
     const lock = readLock()
     const appKey = cliConfig.projectKey || symbolsConfig.key
     const branch = cliConfig.branch || symbolsConfig.branch || 'main'

package/bin/servers.js

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+import inquirer from 'inquirer'
+import chalk from 'chalk'
+import { program } from './program.js'
+import { CredentialManager } from '../helpers/credentialManager.js'
+
+program
+  .command('servers')
+  .description('List and switch Symbols CLI servers (API base URLs)')
+  .option('-s, --select', 'Interactively select active server')
+  .action(async (opts) => {
+    const cm = new CredentialManager()
+    const profiles = cm.getProfiles()
+    const current = cm.getCurrentApiBaseUrl()
+
+    const urls = Object.keys(profiles || {})
+
+    if (!urls.length) {
+      console.log(chalk.yellow('No servers configured yet. Run `smbls login` first.'))
+      return
+    }
+
+    console.log(chalk.bold('\nConfigured servers:'))
+    urls.forEach((apiBaseUrl) => {
+      const profile = profiles[apiBaseUrl] || {}
+      const marker = apiBaseUrl === current ? chalk.green('●') : '○'
+      const email = profile.email ? chalk.dim(`  (${profile.email})`) : ''
+      console.log(`${marker} ${chalk.cyan(apiBaseUrl)}${email}`)
+    })
+
+    if (!opts.select) return
+
+    const { next } = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'next',
+        message: 'Select active server:',
+        choices: urls.map((url) => ({
+          name: `${url}${url === current ? ' (current)' : ''}`,
+          value: url
+        }))
+      }
+    ])
+
+    cm.setCurrentApiBaseUrl(next)
+    console.log(chalk.green(`\nActive server set to ${next}`))
+  })
+

package/bin/sync.js

@@ -148,18 +148,17 @@ async function confirmChanges(localChanges, remoteChanges, base, local, remote)
 }
 
 export async function syncProjectChanges(options) {
-  const credManager = new CredentialManager()
-  const authToken = credManager.ensureAuthToken()
-
-  if (!authToken) {
-    showAuthRequiredMessages()
-    process.exit(1)
-  }
-
   try {
     // Load configuration
     const symbolsConfig = await loadSymbolsConfig()
     const cliConfig = loadCliConfig()
+    const credManager = new CredentialManager()
+    const authToken = credManager.ensureAuthToken(cliConfig.apiBaseUrl)
+
+    if (!authToken) {
+      showAuthRequiredMessages()
+      process.exit(1)
+    }
     const lock = readLock()
     const { projectPath } = getConfigPaths()
     const { key: legacyKey } = symbolsConfig

package/helpers/config.js

@@ -1,5 +1,6 @@
 import fs from 'fs'
 import path from 'path'
+import { CredentialManager } from './credentialManager.js'
 
 // New configuration layout
 // .symbols/config.json  -> project runtime configuration (apiBaseUrl, projectKey|projectId, branch)
@@ -67,12 +68,21 @@ export function loadCliConfig() {
   // Legacy rc might include apiUrl
   const legacyRc = readJsonSafe(LEGACY_RC_PATH) || {}
 
-  const apiBaseUrl =
+  // Prefer explicit env / project config, then legacy rc, then global current server
+  let apiBaseUrl =
     envApi ||
     symbolsConfig.apiBaseUrl ||
-    legacyRc.apiUrl ||
-    // default to production if nothing set
-    'https://api.symbols.app'
+    legacyRc.apiUrl
+
+  if (!apiBaseUrl) {
+    const credManager = new CredentialManager()
+    apiBaseUrl = credManager.getCurrentApiBaseUrl()
+  }
+
+  if (!apiBaseUrl) {
+    // default to production if nothing set anywhere
+    apiBaseUrl = 'https://api.symbols.app'
+  }
 
   const projectKey = envProjectKey || symbolsConfig.projectKey || legacySymbols.key
   const projectId = envProjectId || symbolsConfig.projectId || null

package/helpers/credentialManager.js

@@ -3,28 +3,27 @@ import path from 'path'
 import os from 'os'
 
 const RC_FILE = '.smblsrc'
+const DEFAULT_API = 'https://api.symbols.app'
 
 export class CredentialManager {
   constructor() {
     this.rcPath = path.join(os.homedir(), RC_FILE)
   }
 
-  // Load credentials from rc file
-  loadCredentials() {
+  // --- Low-level helpers ----------------------------------------------------
+
+  loadRaw() {
     try {
       const data = fs.readFileSync(this.rcPath, 'utf8')
       return JSON.parse(data)
-    } catch (err) {
+    } catch (_) {
       return {}
     }
   }
 
-  // Save credentials to rc file
-  saveCredentials(credentials) {
+  saveRaw(obj) {
     try {
-      const existing = this.loadCredentials()
-      const merged = { ...existing, ...credentials }
-      fs.writeFileSync(this.rcPath, JSON.stringify(merged, null, 2))
+      fs.writeFileSync(this.rcPath, JSON.stringify(obj, null, 2))
       return true
     } catch (err) {
       console.error('Failed to save credentials:', err)
@@ -32,35 +31,161 @@ export class CredentialManager {
     }
   }
 
-  // Get stored auth token
-  getAuthToken() {
+  // Ensure we always work with a "profiles" structure and migrate legacy files
+  loadState() {
+    const raw = this.loadRaw()
+    if (raw && typeof raw === 'object' && raw.profiles) return raw
+
+    // Legacy shape: single set of credentials at the top level
+    const {
+      authToken,
+      token,
+      accessToken,
+      jwt,
+      refreshToken,
+      authTokenExpiresAt,
+      userId,
+      email,
+      apiBaseUrl,
+      ...rest
+    } = raw || {}
+
+    const legacyToken = authToken || token || accessToken || jwt
+    const hasLegacyCreds =
+      legacyToken || refreshToken || authTokenExpiresAt || userId || email
+
+    if (!hasLegacyCreds) {
+      // Nothing to migrate
+      return raw || {}
+    }
+
+    const baseUrl = apiBaseUrl || DEFAULT_API
+    const profileCreds = {
+      authToken: legacyToken || null,
+      refreshToken: refreshToken || null,
+      authTokenExpiresAt: authTokenExpiresAt || null,
+      userId: userId || null,
+      email: email || null,
+      apiBaseUrl: baseUrl
+    }
+
+    const migrated = {
+      ...rest,
+      profiles: { [baseUrl]: profileCreds },
+      currentApiBaseUrl: baseUrl
+    }
+
+    this.saveRaw(migrated)
+    return migrated
+  }
+
+  getProfiles() {
+    const state = this.loadState()
+    return state.profiles || {}
+  }
+
+  getCurrentApiBaseUrl() {
+    const state = this.loadState()
+    return state.currentApiBaseUrl || DEFAULT_API
+  }
+
+  setCurrentApiBaseUrl(apiBaseUrl) {
+    const state = this.loadState()
+    const next = { ...state, currentApiBaseUrl: apiBaseUrl || DEFAULT_API }
+    this.saveRaw(next)
+    return next
+  }
+
+  // --- High-level token helpers ---------------------------------------------
+
+  // Get stored auth token for a specific API base URL (or current if omitted)
+  getAuthToken(apiBaseUrl) {
     const envToken = process.env.SYMBOLS_TOKEN || process.env.SMBLS_TOKEN
     if (envToken) return envToken
-    const creds = this.loadCredentials()
-    return creds.authToken || creds.token || creds.accessToken || creds.jwt
+
+    const state = this.loadState() || {}
+    const baseUrl = apiBaseUrl || state.currentApiBaseUrl || DEFAULT_API
+
+    if (state.profiles && typeof state.profiles === 'object') {
+      const profile = state.profiles[baseUrl] || {}
+      return (
+        profile.authToken ||
+        profile.token ||
+        profile.accessToken ||
+        profile.jwt ||
+        null
+      )
+    }
+
+    // Fallback: legacy flat shape
+    return (
+      state.authToken ||
+      state.token ||
+      state.accessToken ||
+      state.jwt ||
+      null
+    )
   }
 
   // Ensure token presence; returns token or null
-  ensureAuthToken() {
-    const token = this.getAuthToken()
+  ensureAuthToken(apiBaseUrl) {
+    const token = this.getAuthToken(apiBaseUrl)
     return token || null
   }
 
   // Optional: get refresh token if present
-  getRefreshToken() {
+  getRefreshToken(apiBaseUrl) {
     const envToken = process.env.SYMBOLS_REFRESH_TOKEN
     if (envToken) return envToken
-    const creds = this.loadCredentials()
-    return creds.refreshToken || null
+
+    const state = this.loadState() || {}
+    const baseUrl = apiBaseUrl || state.currentApiBaseUrl || DEFAULT_API
+
+    if (state.profiles && typeof state.profiles === 'object') {
+      return state.profiles[baseUrl]?.refreshToken || null
+    }
+
+    return state.refreshToken || null
   }
 
-  // Clear stored credentials
-  clearCredentials() {
-    try {
-      fs.unlinkSync(this.rcPath)
-      return true
-    } catch (err) {
-      return false
+  // Save credentials for a specific API base URL
+  saveCredentials(credentials) {
+    const state = this.loadState() || {}
+    const baseUrl = credentials.apiBaseUrl || state.currentApiBaseUrl || DEFAULT_API
+    const profiles = state.profiles || {}
+    const existing = profiles[baseUrl] || {}
+
+    const mergedProfile = { ...existing, ...credentials, apiBaseUrl: baseUrl }
+
+    const next = {
+      ...state,
+      profiles: { ...profiles, [baseUrl]: mergedProfile },
+      currentApiBaseUrl: baseUrl
+    }
+
+    return this.saveRaw(next)
+  }
+
+  // Clear stored credentials; if apiBaseUrl provided, clear only that profile
+  clearCredentials(apiBaseUrl) {
+    const state = this.loadState() || {}
+
+    if (!state.profiles || typeof state.profiles !== 'object') {
+      // Legacy: remove entire file
+      try {
+        fs.unlinkSync(this.rcPath)
+        return true
+      } catch (_) {
+        return false
+      }
     }
+
+    const baseUrl = apiBaseUrl || state.currentApiBaseUrl
+    if (!baseUrl) return false
+
+    const { [baseUrl]: _, ...restProfiles } = state.profiles
+    const next = { ...state, profiles: restProfiles }
+    this.saveRaw(next)
+    return true
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/cli",
-  "version": "2.33.20",
+  "version": "2.33.25",
   "description": "Fetch your Symbols configuration",
   "main": "bin/fetch.js",
   "author": "Symbols",
@@ -15,9 +15,9 @@
     "vpatch": "npm version patch && npm publish"
   },
   "dependencies": {
-    "@symbo.ls/fetch": "^2.33.20",
-    "@symbo.ls/init": "^2.33.20",
-    "@symbo.ls/socket": "^2.33.20",
+    "@symbo.ls/fetch": "^2.33.25",
+    "@symbo.ls/init": "^2.33.25",
+    "@symbo.ls/socket": "^2.33.25",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",
@@ -28,5 +28,5 @@
     "socket.io-client": "^4.8.1",
     "v8-compile-cache": "^2.4.0"
   },
-  "gitHead": "717ab2ed8690b295c7d6c79e31831048f20f4e86"
+  "gitHead": "b0524b9f29fed6070d8e718d73b290097696ac48"
 }