Rename package to scope3 and fix changeset publishing

.changeset/cli-tool.md

@@ -1,5 +1,4 @@
 ---
-"@scope3/agentic-client": minor
 "scope3": minor
 ---
 

README.md

@@ -18,13 +18,13 @@ TypeScript client for the Scope3 Agentic API with AdCP webhook support.
 ## Installation
 
 ```bash
-npm install @scope3/agentic-client
+npm install scope3
 ```
 
 ## Quick Start
 
 ```typescript
-import { Scope3AgenticClient } from '@scope3/agentic-client';
+import { Scope3AgenticClient } from 'scope3';
 
 const client = new Scope3AgenticClient({
   apiKey: process.env.SCOPE3_API_KEY,
@@ -50,9 +50,7 @@ const campaign = await client.campaigns.create({
 
 The CLI dynamically discovers available commands from the API server, ensuring it's always up-to-date.
 
-### Quick Start (Recommended)
-
-For the shortest command, use the `scope3` package:
+### Quick Start
 
 ```bash
 # Use with npx (no install needed)
@@ -61,15 +59,6 @@ npx scope3 --help
 # Or install globally
 npm install -g scope3
 scope3 --help
-```
-
-### Alternative: Full Package Name
-
-You can also use the full package name:
-
-```bash
-npm install -g @scope3/agentic-client
-npx @scope3/agentic-client --help
 
 # Configure authentication
 scope3 config set apiKey your_api_key_here

package.json

@@ -1,10 +1,7 @@
 {
-  "name": "@scope3/agentic-client",
+  "name": "scope3",
   "version": "1.0.5",
-  "description": "TypeScript client for the Scope3 Agentic API with AdCP webhook support",
-  "workspaces": [
-    "packages/*"
-  ],
+  "description": "CLI and TypeScript client for the Scope3 Agentic API with AdCP webhook support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -49,7 +46,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/scope3data/agentic-client.git"
+    "url": "git+https://github.com/scope3data/agentic-client.git",
+    "directory": "."
   },
   "bugs": {
     "url": "https://github.com/scope3data/agentic-client/issues"

src/__tests__/client-mcp.test.ts

@@ -173,10 +173,10 @@ describe('Scope3Client MCP Protocol', () => {
       });
 
       await expect(client['callTool']('test_tool', {})).rejects.toThrow(
-        'MCP API returned response without structuredContent'
+        'API Error: Missing structured data'
       );
       await expect(client['callTool']('test_tool', {})).rejects.toThrow(
-        'This violates the Scope3 API specification'
+        'This is an API bug that needs to be fixed upstream'
       );
     });
 
@@ -187,7 +187,7 @@ describe('Scope3Client MCP Protocol', () => {
       });
 
       await expect(client['callTool']('test_tool', {})).rejects.toThrow(
-        'MCP API returned response without structuredContent'
+        'API Error: Missing structured data'
       );
     });
 
@@ -198,7 +198,7 @@ describe('Scope3Client MCP Protocol', () => {
       });
 
       await expect(client['callTool']('test_tool', {})).rejects.toThrow(
-        'MCP API returned response without structuredContent'
+        'API Error: Missing structured data'
       );
     });
 
@@ -208,7 +208,7 @@ describe('Scope3Client MCP Protocol', () => {
       });
 
       await expect(client['callTool']('test_tool', {})).rejects.toThrow('test_tool');
-      await expect(client['callTool']('test_tool', {})).rejects.toThrow('Debug info');
+      await expect(client['callTool']('test_tool', {})).rejects.toThrow('API Error');
     });
   });
 
@@ -219,7 +219,7 @@ describe('Scope3Client MCP Protocol', () => {
       });
 
       await expect(client['callTool']('test_tool', {})).rejects.toThrow(
-        'MCP API returned response without structuredContent'
+        'API Error: Missing structured data'
       );
     });
 
@@ -229,7 +229,7 @@ describe('Scope3Client MCP Protocol', () => {
       });
 
       await expect(client['callTool']('test_tool', {})).rejects.toThrow(
-        'MCP API returned response without structuredContent'
+        'API Error: Missing structured data'
       );
     });
 
@@ -291,7 +291,7 @@ describe('Scope3Client MCP Protocol', () => {
 
       // Should throw before storing debug info
       await expect(client['callTool']('test_tool', {})).rejects.toThrow(
-        'MCP API returned response without structuredContent'
+        'API Error: Missing structured data'
       );
     });
 

src/cli.ts

@@ -16,7 +16,9 @@ const TOOLS_CACHE_FILE = path.join(CONFIG_DIR, 'tools-cache.json');
 const CACHE_TTL = 24 * 60 * 60 * 1000; // 24 hours
 
 interface CliConfig {
-  apiKey?: string;
+  apiKey?: string; // Legacy single API key
+  productionApiKey?: string; // Production-specific API key
+  stagingApiKey?: string; // Staging-specific API key
   environment?: 'production' | 'staging';
   baseUrl?: string;
 }
@@ -45,6 +47,8 @@ function loadConfig(): CliConfig {
     try {
       const fileConfig = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8'));
       config.apiKey = fileConfig.apiKey;
+      config.productionApiKey = fileConfig.productionApiKey;
+      config.stagingApiKey = fileConfig.stagingApiKey;
       config.environment = fileConfig.environment;
       config.baseUrl = fileConfig.baseUrl;
     } catch (error) {
@@ -382,19 +386,39 @@ function createClient(
 ): Scope3AgenticClient {
   const config = loadConfig();
 
-  const finalApiKey = apiKey || config.apiKey;
+  // Determine final environment
+  const finalEnvironment = environment || config.environment || 'production';
+
+  // Select API key based on priority:
+  // 1. Explicitly passed apiKey (--api-key flag)
+  // 2. Environment-specific key from config (productionApiKey/stagingApiKey)
+  // 3. Legacy single apiKey from config
+  let finalApiKey = apiKey;
+  if (!finalApiKey) {
+    if (finalEnvironment === 'staging' && config.stagingApiKey) {
+      finalApiKey = config.stagingApiKey;
+    } else if (finalEnvironment === 'production' && config.productionApiKey) {
+      finalApiKey = config.productionApiKey;
+    } else {
+      finalApiKey = config.apiKey; // Fallback to legacy key
+    }
+  }
+
   if (!finalApiKey) {
     console.error(chalk.red('Error: API key is required'));
     console.log('Set it via:');
     console.log('  - Environment variable: export SCOPE3_API_KEY=your_key');
     console.log('  - Config command: scope3 config set apiKey your_key');
+    console.log('  - Or use environment-specific keys:');
+    console.log('    scope3 config set productionApiKey your_production_key');
+    console.log('    scope3 config set stagingApiKey your_staging_key');
     console.log('  - Flag: --api-key your_key');
     process.exit(1);
   }
 
   return new Scope3AgenticClient({
     apiKey: finalApiKey,
-    environment: environment || config.environment,
+    environment: finalEnvironment,
     baseUrl: baseUrl || config.baseUrl,
     debug: debug || false,
   });
@@ -475,12 +499,19 @@ const configCmd = program.command('config').description('Manage CLI configuratio
 configCmd
   .command('set')
   .description('Set configuration value')
-  .argument('<key>', 'Configuration key (apiKey, environment, or baseUrl)')
+  .argument(
+    '<key>',
+    'Configuration key (apiKey, productionApiKey, stagingApiKey, environment, or baseUrl)'
+  )
   .argument('<value>', 'Configuration value')
   .action((key: string, value: string) => {
     const config = loadConfig();
     if (key === 'apiKey') {
       config.apiKey = value;
+    } else if (key === 'productionApiKey') {
+      config.productionApiKey = value;
+    } else if (key === 'stagingApiKey') {
+      config.stagingApiKey = value;
     } else if (key === 'environment') {
       if (value !== 'production' && value !== 'staging') {
         console.error(chalk.red(`Error: Invalid environment: ${value}`));
@@ -492,7 +523,7 @@ configCmd
       config.baseUrl = value;
     } else {
       console.error(chalk.red(`Error: Unknown config key: ${key}`));
-      console.log('Valid keys: apiKey, environment, baseUrl');
+      console.log('Valid keys: apiKey, productionApiKey, stagingApiKey, environment, baseUrl');
       process.exit(1);
     }
     saveConfig(config);
@@ -501,7 +532,10 @@ configCmd
 configCmd
   .command('get')
   .description('Get configuration value')
-  .argument('[key]', 'Configuration key (apiKey or baseUrl). If omitted, shows all config')
+  .argument(
+    '[key]',
+    'Configuration key (apiKey, productionApiKey, stagingApiKey, environment, or baseUrl). If omitted, shows all config'
+  )
   .action((key?: string) => {
     const config = loadConfig();
     if (!key) {
@@ -510,6 +544,12 @@ configCmd
       if (safeConfig.apiKey) {
         safeConfig.apiKey = safeConfig.apiKey.substring(0, 8) + '...[REDACTED]';
       }
+      if (safeConfig.productionApiKey) {
+        safeConfig.productionApiKey = safeConfig.productionApiKey.substring(0, 8) + '...[REDACTED]';
+      }
+      if (safeConfig.stagingApiKey) {
+        safeConfig.stagingApiKey = safeConfig.stagingApiKey.substring(0, 8) + '...[REDACTED]';
+      }
       console.log(JSON.stringify(safeConfig, null, 2));
     } else if (key in config) {
       console.log(config[key as keyof CliConfig]);
@@ -689,9 +729,17 @@ async function setupDynamicCommands() {
           } catch (error: unknown) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             const errorStack = error instanceof Error ? error.stack : undefined;
-            logger.error('Tool execution failed', error, { toolName: tool.name });
+
+            // Only log to logger in debug mode
+            if (globalOpts.debug) {
+              logger.error('Tool execution failed', error, { toolName: tool.name });
+            }
+
             console.error(chalk.red('Error:'), errorMessage);
-            if (errorStack && process.env.DEBUG) {
+
+            // Show stack trace only in debug mode
+            if (errorStack && globalOpts.debug) {
+              console.error(chalk.gray('\nStack trace:'));
               console.error(chalk.gray(errorStack));
             }
             process.exit(1);