@hiyve/cli 1.0.11 → 1.0.13

package/README.md

@@ -67,7 +67,7 @@ Templates: `basic`, `ai`, `full`
 
 ## Getting Your API Key
 
-1. Log in to the [Hiyve Developer Console](https://console.hiyve.dev)
+1. Log in to the [Hiyve Developer Console](https://api.hiyve.dev)
 2. Navigate to **API Keys** in the sidebar
 3. Copy your secret key (starts with `sk_test_` or `sk_live_`)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiyve/cli",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Hiyve SDK CLI - Configure npm for private @hiyve packages",
   "type": "module",
   "bin": {

package/src/commands/init.js

@@ -217,7 +217,7 @@ export default defineConfig({
 }
 
 function generateEnvExample(template) {
-  let env = `# Hiyve API Key (from console.hiyve.dev)
+  let env = `# Hiyve API Key (from api.hiyve.dev)
 HIYVE_API_KEY=pk_live_your_api_key_here
 
 # Room configuration

package/src/commands/list.js

@@ -6,7 +6,7 @@
 
 import chalk from 'chalk';
 import ora from 'ora';
-import { getApiUrl } from '../config.js';
+import { getApiUrl, isDevMode } from '../config.js';
 import { getCurrentConfig } from '../utils/npmrc.js';
 
 /**
@@ -16,6 +16,9 @@ export async function list() {
   console.log('');
   console.log(chalk.cyan('Available @hiyve Packages'));
   console.log(chalk.gray('─'.repeat(40)));
+  if (isDevMode()) {
+    console.log(chalk.yellow('  Mode: development (--dev)'));
+  }
   console.log('');
 
   // Get current config for auth token
@@ -41,6 +44,14 @@ export async function list() {
       const error = await response.json().catch(() => ({ error: 'Unknown error' }));
       console.log('');
       console.log(chalk.red(`  ${error.error || 'Failed to fetch packages'}`));
+      if (isDevMode()) {
+        console.log(chalk.gray('  You are using --dev mode (development registry).'));
+        console.log(chalk.gray('  If you meant to use production, run without --dev:'));
+        console.log(chalk.cyan('    npx @hiyve/cli list'));
+      } else {
+        console.log(chalk.gray('  If you meant to use the development registry, use --dev:'));
+        console.log(chalk.cyan('    npx @hiyve/cli --dev list'));
+      }
       process.exit(1);
     }
 
@@ -74,7 +85,15 @@ export async function list() {
     spinner.fail('Connection failed');
     console.log('');
     console.log(chalk.red(`  ${err.message}`));
-    console.log(chalk.gray('  Please check your internet connection'));
+    console.log(chalk.gray('  Please check your internet connection.'));
+    if (isDevMode()) {
+      console.log(chalk.gray('  You are using --dev mode (development registry).'));
+      console.log(chalk.gray('  If you meant to use production, run without --dev:'));
+      console.log(chalk.cyan('    npx @hiyve/cli list'));
+    } else {
+      console.log(chalk.gray('  If you meant to use the development registry, use --dev:'));
+      console.log(chalk.cyan('    npx @hiyve/cli --dev list'));
+    }
     process.exit(1);
   }
 }

package/src/commands/login.js

@@ -8,7 +8,7 @@ import prompts from 'prompts';
 import chalk from 'chalk';
 import ora from 'ora';
 import { configureNpmrc } from '../utils/npmrc.js';
-import { getApiUrl, getRegistryUrl } from '../config.js';
+import { getApiUrl, getRegistryUrl, isDevMode } from '../config.js';
 
 /**
  * Login to Hiyve and configure npm
@@ -21,6 +21,9 @@ export async function login(options) {
   console.log('');
   console.log(chalk.cyan('Hiyve SDK Authentication'));
   console.log(chalk.gray('─'.repeat(40)));
+  if (isDevMode()) {
+    console.log(chalk.yellow('  Mode: development (--dev)'));
+  }
   console.log('');
 
   // Prompt for API key if not provided
@@ -28,11 +31,14 @@ export async function login(options) {
     const response = await prompts({
       type: 'password',
       name: 'apiKey',
-      message: 'Enter your Hiyve API key:',
+      message: 'Enter your Hiyve API key (pk_*):',
       validate: (value) => {
         if (!value) return 'API key is required';
-        if (!value.startsWith('sk_') && !value.startsWith('mk_')) {
-          return 'API key should start with sk_test_, sk_live_, or mk_';
+        if (!value.startsWith('pk_')) {
+          if (value.startsWith('sk_')) {
+            return 'Secret keys (sk_*) are no longer needed for registry login. Use your API key (pk_*) from console.hiyve.dev';
+          }
+          return 'Expected an API key starting with pk_test_ or pk_live_ (from console.hiyve.dev)';
         }
         if (value.length < 35) return 'API key appears to be too short';
         return true;
@@ -48,17 +54,26 @@ export async function login(options) {
     apiKey = response.apiKey;
   }
 
-  // Validate API key format (sk_test_*, sk_live_*, or legacy mk_*)
+  // Validate API key format
+  const isPublicKey = apiKey.match(/^pk_(test|live)_[a-fA-F0-9]+$/);
+
+  // Accept legacy sk_ and mk_ keys for backward compatibility (existing users)
   const isSecretKey = apiKey.match(/^sk_(test|live)_[a-fA-F0-9]+$/);
   const isManagementKey = apiKey.match(/^mk_[a-fA-F0-9]{32}$/);
 
-  if (!isSecretKey && !isManagementKey) {
+  if (!isPublicKey && !isSecretKey && !isManagementKey) {
     console.log('');
     console.log(chalk.red('✗ Invalid API key format'));
-    console.log(chalk.gray('  Expected: sk_test_* or sk_live_* (from console.hiyve.dev)'));
+    console.log(chalk.gray('  Expected: pk_test_* or pk_live_* (from console.hiyve.dev)'));
     process.exit(1);
   }
 
+  if (isSecretKey) {
+    console.log(chalk.yellow('  Note: Secret keys (sk_*) still work but are no longer required.'));
+    console.log(chalk.yellow('  You can use your API key (pk_*) instead for registry access.'));
+    console.log('');
+  }
+
   // Verify API key with registry
   const spinner = ora('Verifying API key...').start();
 
@@ -74,6 +89,14 @@ export async function login(options) {
       spinner.fail('API key verification failed');
       console.log('');
       console.log(chalk.red(`  ${error.error || 'Invalid API key'}`));
+      if (isDevMode()) {
+        console.log(chalk.gray('  You are using --dev mode (development registry).'));
+        console.log(chalk.gray('  If you meant to use production, run without --dev:'));
+        console.log(chalk.cyan('    npx @hiyve/cli login'));
+      } else {
+        console.log(chalk.gray('  If you are using a test key (pk_test_*), use --dev mode:'));
+        console.log(chalk.cyan('    npx @hiyve/cli --dev login'));
+      }
       process.exit(1);
     }
 
@@ -87,7 +110,15 @@ export async function login(options) {
     spinner.fail('Connection failed');
     console.log('');
     console.log(chalk.red(`  ${err.message}`));
-    console.log(chalk.gray('  Please check your internet connection'));
+    console.log(chalk.gray('  Please check your internet connection.'));
+    if (isDevMode()) {
+      console.log(chalk.gray('  You are using --dev mode (development registry).'));
+      console.log(chalk.gray('  If you meant to use production, run without --dev:'));
+      console.log(chalk.cyan('    npx @hiyve/cli login'));
+    } else {
+      console.log(chalk.gray('  If you meant to use the development registry, use --dev:'));
+      console.log(chalk.cyan('    npx @hiyve/cli --dev login'));
+    }
     process.exit(1);
   }
 

package/src/config.js

@@ -34,6 +34,13 @@ export function getRegistryUrl() {
   return _devMode ? DEV_API_URL : PROD_API_URL;
 }
 
+/**
+ * Check if dev mode is currently active.
+ */
+export function isDevMode() {
+  return _devMode;
+}
+
 // Backwards-compatible named export
 export const REGISTRY_URL = PROD_API_URL;
 
@@ -42,4 +49,5 @@ export default {
   getApiUrl,
   getRegistryUrl,
   setDevMode,
+  isDevMode,
 };

package/src/utils/npmrc.js

@@ -32,7 +32,8 @@ export async function configureNpmrc(registryUrl, apiKey) {
       !trimmed.includes('//api.hiyve.dev/') &&
       !trimmed.includes('//api.muziemedia.com/') &&
       !trimmed.includes(':_authToken=mk_') &&
-      !trimmed.includes(':_authToken=sk_')
+      !trimmed.includes(':_authToken=sk_') &&
+      !trimmed.includes(':_authToken=pk_')
     );
   });
 
@@ -68,7 +69,8 @@ export async function removeNpmrc() {
       !trimmed.includes('//api.hiyve.dev/') &&
       !trimmed.includes('//api.muziemedia.com/') &&
       !trimmed.includes(':_authToken=mk_') &&
-      !trimmed.includes(':_authToken=sk_')
+      !trimmed.includes(':_authToken=sk_') &&
+      !trimmed.includes(':_authToken=pk_')
     );
   });
 
@@ -92,18 +94,18 @@ export function getCurrentConfig() {
   // Find registry line
   const registryLine = lines.find((line) => line.trim().startsWith('@hiyve:registry'));
 
-  // Find token line (sk_* or legacy mk_*)
+  // Find token line (pk_*, sk_*, or legacy mk_*)
   const tokenLine = lines.find((line) => {
     const trimmed = line.trim();
-    return trimmed.includes(':_authToken=sk_') || trimmed.includes(':_authToken=mk_');
+    return trimmed.includes(':_authToken=pk_') || trimmed.includes(':_authToken=sk_') || trimmed.includes(':_authToken=mk_');
   });
 
   if (!registryLine || !tokenLine) {
     return null;
   }
 
-  // Extract API key (sk_* or legacy mk_*)
-  const tokenMatch = tokenLine.match(/:_authToken=((?:sk_|mk_)[a-zA-Z0-9_]+)/);
+  // Extract API key (pk_*, sk_*, or legacy mk_*)
+  const tokenMatch = tokenLine.match(/:_authToken=((?:pk_|sk_|mk_)[a-zA-Z0-9_]+)/);
   const apiKey = tokenMatch ? tokenMatch[1] : null;
 
   // Mask API key for display

package/src/utils/npmrc.test.js

@@ -32,6 +32,19 @@ describe('configureNpmrc', () => {
     expect(content).toContain(':_authToken=sk_live_abc123def456');
   });
 
+  it('creates .npmrc with pk_ key', async () => {
+    fs.existsSync.mockReturnValue(false);
+    fs.writeFileSync.mockImplementation(() => {});
+
+    await configureNpmrc('https://api.hiyve.dev/registry/', 'pk_live_abc123def456');
+
+    expect(fs.writeFileSync).toHaveBeenCalledOnce();
+    const [writePath, content] = fs.writeFileSync.mock.calls[0];
+    expect(writePath).toBe(NPMRC_PATH);
+    expect(content).toContain('@hiyve:registry=https://api.hiyve.dev/registry/');
+    expect(content).toContain(':_authToken=pk_live_abc123def456');
+  });
+
   it('replaces existing @hiyve lines when .npmrc already has them', async () => {
     const existingContent = [
       '@hiyve:registry=https://old-registry.example.com/',
@@ -54,6 +67,42 @@ describe('configureNpmrc', () => {
     expect(content).toContain(':_authToken=sk_live_newkey5678');
   });
 
+  it('replaces existing sk_ token with pk_ key', async () => {
+    const existingContent = [
+      '@hiyve:registry=https://api.hiyve.dev/registry/',
+      '//api.hiyve.dev/registry/:_authToken=sk_live_oldkey1234',
+      'other-config=value',
+    ].join('\n');
+
+    fs.existsSync.mockReturnValue(true);
+    fs.readFileSync.mockReturnValue(existingContent);
+    fs.writeFileSync.mockImplementation(() => {});
+
+    await configureNpmrc('https://api.hiyve.dev/registry/', 'pk_live_newkey5678');
+
+    const [, content] = fs.writeFileSync.mock.calls[0];
+    expect(content).not.toContain('sk_live_oldkey1234');
+    expect(content).toContain(':_authToken=pk_live_newkey5678');
+  });
+
+  it('replaces existing pk_ token with new pk_ key', async () => {
+    const existingContent = [
+      '@hiyve:registry=https://api.hiyve.dev/registry/',
+      '//api.hiyve.dev/registry/:_authToken=pk_test_oldkey1234',
+      'other-config=value',
+    ].join('\n');
+
+    fs.existsSync.mockReturnValue(true);
+    fs.readFileSync.mockReturnValue(existingContent);
+    fs.writeFileSync.mockImplementation(() => {});
+
+    await configureNpmrc('https://api.hiyve.dev/registry/', 'pk_live_newkey5678');
+
+    const [, content] = fs.writeFileSync.mock.calls[0];
+    expect(content).not.toContain('pk_test_oldkey1234');
+    expect(content).toContain(':_authToken=pk_live_newkey5678');
+  });
+
   it('replaces legacy mk_ tokens', async () => {
     const existingContent = [
       '@hiyve:registry=https://console.hiyve.dev/api/registry/',
@@ -172,6 +221,47 @@ describe('removeNpmrc', () => {
     expect(content).not.toContain('sk_live_abc123def456');
   });
 
+  it('removes @hiyve lines with pk_ tokens', async () => {
+    const existingContent = [
+      'registry=https://registry.npmjs.org/',
+      '@hiyve:registry=https://api.hiyve.dev/registry/',
+      '//api.hiyve.dev/registry/:_authToken=pk_live_abc123def456',
+      'other-config=true',
+    ].join('\n');
+
+    fs.existsSync.mockReturnValue(true);
+    fs.readFileSync.mockReturnValue(existingContent);
+    fs.writeFileSync.mockImplementation(() => {});
+
+    await removeNpmrc();
+
+    const [, content] = fs.writeFileSync.mock.calls[0];
+    expect(content).not.toContain('@hiyve:registry');
+    expect(content).not.toContain('api.hiyve.dev');
+    expect(content).not.toContain('pk_live_abc123def456');
+    expect(content).toContain('other-config=true');
+  });
+
+  it('removes @hiyve lines with pk_ tokens (old registry)', async () => {
+    const existingContent = [
+      'registry=https://registry.npmjs.org/',
+      '@hiyve:registry=https://console.hiyve.dev/api/registry/',
+      '//console.hiyve.dev/api/registry/:_authToken=pk_test_abc123def456',
+      'other-config=true',
+    ].join('\n');
+
+    fs.existsSync.mockReturnValue(true);
+    fs.readFileSync.mockReturnValue(existingContent);
+    fs.writeFileSync.mockImplementation(() => {});
+
+    await removeNpmrc();
+
+    const [, content] = fs.writeFileSync.mock.calls[0];
+    expect(content).not.toContain('@hiyve:registry');
+    expect(content).not.toContain('console.hiyve.dev');
+    expect(content).not.toContain('pk_test_abc123def456');
+  });
+
   it('removes @hiyve lines with legacy mk_ tokens', async () => {
     const existingContent = [
       'registry=https://registry.npmjs.org/',
@@ -243,6 +333,40 @@ describe('getCurrentConfig', () => {
     expect(getCurrentConfig()).toBeNull();
   });
 
+  it('returns config for pk_ keys (new registry)', () => {
+    const content = [
+      '@hiyve:registry=https://api.hiyve.dev/registry/',
+      '//api.hiyve.dev/registry/:_authToken=pk_live_1a2b3c4d5e6f7890abcd',
+    ].join('\n');
+
+    fs.existsSync.mockReturnValue(true);
+    fs.readFileSync.mockReturnValue(content);
+
+    const result = getCurrentConfig();
+    expect(result).toEqual({
+      apiKey: 'pk_live_1a2b3c4d5e6f7890abcd',
+      maskedApiKey: 'pk_live_...abcd',
+      registryUrl: 'https://api.hiyve.dev/registry/',
+    });
+  });
+
+  it('returns config for pk_ keys (old registry — backward compat)', () => {
+    const content = [
+      '@hiyve:registry=https://console.hiyve.dev/api/registry/',
+      '//console.hiyve.dev/api/registry/:_authToken=pk_test_1a2b3c4d5e6f7890abcd',
+    ].join('\n');
+
+    fs.existsSync.mockReturnValue(true);
+    fs.readFileSync.mockReturnValue(content);
+
+    const result = getCurrentConfig();
+    expect(result).toEqual({
+      apiKey: 'pk_test_1a2b3c4d5e6f7890abcd',
+      maskedApiKey: 'pk_test_...abcd',
+      registryUrl: 'https://console.hiyve.dev/api/registry/',
+    });
+  });
+
   it('returns config for sk_ keys (new registry)', () => {
     const content = [
       '@hiyve:registry=https://api.hiyve.dev/registry/',
@@ -294,7 +418,7 @@ describe('getCurrentConfig', () => {
     });
   });
 
-  it('maskedApiKey shows first 8 and last 4 chars', () => {
+  it('maskedApiKey shows first 8 and last 4 chars for sk_ keys', () => {
     const apiKey = 'sk_test_aabbccdd11223344eeff';
     const content = [
       '@hiyve:registry=https://api.hiyve.dev/registry/',
@@ -309,6 +433,21 @@ describe('getCurrentConfig', () => {
     expect(result.maskedApiKey).toBe('sk_test_...eeff');
   });
 
+  it('maskedApiKey shows first 8 and last 4 chars for pk_ keys', () => {
+    const apiKey = 'pk_live_aabbccdd11223344eeff';
+    const content = [
+      '@hiyve:registry=https://api.hiyve.dev/registry/',
+      `//api.hiyve.dev/registry/:_authToken=${apiKey}`,
+    ].join('\n');
+
+    fs.existsSync.mockReturnValue(true);
+    fs.readFileSync.mockReturnValue(content);
+
+    const result = getCurrentConfig();
+    expect(result.apiKey).toBe(apiKey);
+    expect(result.maskedApiKey).toBe('pk_live_...eeff');
+  });
+
   it('returns null when only registry line is present but no token', () => {
     const content = '@hiyve:registry=https://api.hiyve.dev/registry/\n';