@revenium/claude-code-metering 0.1.0 → 0.1.2

package/dist/cli/index.js

@@ -1,65 +1,79 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.program = void 0;
 const commander_1 = require("commander");
 const setup_js_1 = require("./commands/setup.js");
 const status_js_1 = require("./commands/status.js");
 const test_js_1 = require("./commands/test.js");
 const backfill_js_1 = require("./commands/backfill.js");
-const program = new commander_1.Command();
-program
-    .name('revenium-metering')
-    .description('Configure Claude Code telemetry export to Revenium')
-    .version('0.1.0');
-program
-    .command('setup')
-    .description('Interactive setup wizard to configure Claude Code metering')
-    .option('-k, --api-key <key>', 'Revenium API key (hak_...)')
-    .option('-e, --email <email>', 'Email for usage attribution')
-    .option('-t, --tier <tier>', 'Subscription tier (pro, max_5x, max_20x, team_premium, enterprise, api)')
-    .option('--endpoint <url>', 'Revenium API endpoint URL')
-    .option('--skip-shell-update', 'Skip automatic shell profile update')
+exports.program = new commander_1.Command();
+exports.program
+    .name("revenium-metering")
+    .description("Configure Claude Code telemetry export to Revenium")
+    .version("0.1.1");
+exports.program
+    .command("setup")
+    .description("Interactive setup wizard to configure Claude Code metering")
+    .option("-k, --api-key <key>", "Revenium API key (hak_...)")
+    .option("-e, --email <email>", "Email for usage attribution")
+    .option("-t, --tier <tier>", "Subscription tier (professional, max, team, enterprise, api)")
+    .option("--endpoint <url>", "Revenium API endpoint URL")
+    .option("-o, --organization <name>", "Organization name for cost attribution")
+    .option("-p, --product <name>", "Product name for cost attribution")
+    .option("--skip-shell-update", "Skip automatic shell profile update")
     .action(async (options) => {
     await (0, setup_js_1.setupCommand)({
         apiKey: options.apiKey,
         email: options.email,
         tier: options.tier,
         endpoint: options.endpoint,
+        organizationId: options.organization,
+        productId: options.product,
         skipShellUpdate: options.skipShellUpdate,
     });
 });
-program
-    .command('status')
-    .description('Check current configuration and endpoint connectivity')
+exports.program
+    .command("status")
+    .description("Check current configuration and endpoint connectivity")
     .action(async () => {
     await (0, status_js_1.statusCommand)();
 });
-program
-    .command('test')
-    .description('Send a test metric to verify the integration')
-    .option('-v, --verbose', 'Show detailed payload information')
+exports.program
+    .command("test")
+    .description("Send a test metric to verify the integration")
+    .option("-v, --verbose", "Show detailed payload information")
     .action(async (options) => {
     await (0, test_js_1.testCommand)({ verbose: options.verbose });
 });
-program
-    .command('backfill')
-    .description('Import historical Claude Code usage data from local JSONL files')
-    .option('--since <date>', 'Only backfill after this date (ISO format or relative like "7d", "1m")')
-    .option('--dry-run', 'Show what would be sent without sending')
-    .option('--batch-size <n>', 'Messages per API batch (default: 100)', '100')
-    .option('-v, --verbose', 'Show detailed progress')
+exports.program
+    .command("backfill")
+    .description("Import historical Claude Code usage data from local JSONL files")
+    .option("--since <date>", 'Only backfill after this date (ISO format or relative like "7d", "1m")')
+    .option("--dry-run", "Show what would be sent without sending")
+    .option("--batch-size <n>", "Messages per API batch (default: 100)", "100")
+    .option("--delay <ms>", "Delay between batches in milliseconds (default: 100)", "100")
+    .option("-v, --verbose", "Show detailed progress")
     .action(async (options) => {
     const batchSize = parseInt(options.batchSize, 10);
-    if (!Number.isFinite(batchSize) || batchSize < 1) {
-        console.error('Error: --batch-size must be a positive integer');
+    if (!Number.isFinite(batchSize) || batchSize < 1 || batchSize > 10000) {
+        console.error("Error: --batch-size must be between 1 and 10000");
+        process.exit(1);
+    }
+    const delay = parseInt(options.delay, 10);
+    if (!Number.isFinite(delay) || delay < 0 || delay > 60000) {
+        console.error("Error: --delay must be between 0 and 60000 milliseconds");
         process.exit(1);
     }
     await (0, backfill_js_1.backfillCommand)({
         since: options.since,
         dryRun: options.dryRun,
         batchSize,
+        delay,
         verbose: options.verbose,
     });
 });
-program.parse();
+if (process.env.NODE_ENV !== "test") {
+    exports.program.parse();
+}
 //# sourceMappingURL=index.js.map

package/dist/cli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AACpC,kDAAmD;AACnD,oDAAqD;AACrD,gDAAiD;AACjD,wDAAyD;AAEzD,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,mBAAmB,CAAC;KACzB,WAAW,CAAC,oDAAoD,CAAC;KACjE,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,4DAA4D,CAAC;KACzE,MAAM,CAAC,qBAAqB,EAAE,4BAA4B,CAAC;KAC3D,MAAM,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;KAC5D,MAAM,CAAC,mBAAmB,EAAE,yEAAyE,CAAC;KACtG,MAAM,CAAC,kBAAkB,EAAE,2BAA2B,CAAC;KACvD,MAAM,CAAC,qBAAqB,EAAE,qCAAqC,CAAC;KACpE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,IAAA,uBAAY,EAAC;QACjB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,eAAe,EAAE,OAAO,CAAC,eAAe;KACzC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,uDAAuD,CAAC;KACpE,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,IAAA,yBAAa,GAAE,CAAC;AACxB,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,8CAA8C,CAAC;KAC3D,MAAM,CAAC,eAAe,EAAE,mCAAmC,CAAC;KAC5D,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,IAAA,qBAAW,EAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,UAAU,CAAC;KACnB,WAAW,CAAC,iEAAiE,CAAC;KAC9E,MAAM,CAAC,gBAAgB,EAAE,wEAAwE,CAAC;KAClG,MAAM,CAAC,WAAW,EAAE,yCAAyC,CAAC;KAC9D,MAAM,CAAC,kBAAkB,EAAE,uCAAuC,EAAE,KAAK,CAAC;KAC1E,MAAM,CAAC,eAAe,EAAE,wBAAwB,CAAC;KACjD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;QACjD,OAAO,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,IAAA,6BAAe,EAAC;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,SAAS;QACT,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}

package/dist/core/api/client.d.ts

@@ -1,22 +1,31 @@
-import type { OTLPMetricsPayload, OTLPResponse, HealthCheckResult } from '../../types/index.js';
+import type { OTLPLogsPayload, OTLPResponse, HealthCheckResult } from "../../types/index.js";
 /**
- * Sends an OTLP metrics payload to the Revenium endpoint.
- * Posts to /meter/v2/otel/v1/metrics with OTEL Metrics format.
+ * Sends an OTLP logs payload to the Revenium endpoint.
  */
-export declare function sendOtlpMetrics(baseEndpoint: string, apiKey: string, payload: OTLPMetricsPayload): Promise<OTLPResponse>;
+export declare function sendOtlpLogs(baseEndpoint: string, apiKey: string, payload: OTLPLogsPayload): Promise<OTLPResponse>;
 /**
  * Options for creating a test payload.
  */
 export interface TestPayloadOptions {
-    /** Optional organization ID to attribute costs to */
+    /** Optional subscriber email for attribution */
+    email?: string;
+    /** Optional organization name to attribute costs to */
+    organizationName?: string;
+    /**
+     * @deprecated Use organizationName instead. This field will be removed in a future version.
+     */
     organizationId?: string;
-    /** Optional product ID to attribute costs to */
+    /** Optional product name to attribute costs to */
+    productName?: string;
+    /**
+     * @deprecated Use productName instead. This field will be removed in a future version.
+     */
     productId?: string;
 }
 /**
- * Creates a minimal test OTEL metrics payload.
+ * Creates a minimal test OTLP logs payload.
  */
-export declare function createTestPayload(sessionId: string, options?: TestPayloadOptions): OTLPMetricsPayload;
+export declare function createTestPayload(sessionId: string, options?: TestPayloadOptions): OTLPLogsPayload;
 /**
  * Generates a unique session ID for test payloads.
  */

package/dist/core/api/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/api/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGhG;;;GAGG;AACH,wBAAsB,eAAe,CACnC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAmBvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gDAAgD;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,kBAAkB,CA4DrG;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAI9C;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CA+B5B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/api/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAG9B;;GAEG;AACH,wBAAsB,YAAY,CAChC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC,CAuBvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,gDAAgD;IAChD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uDAAuD;IACvD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,eAAe,CA2EjB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAI9C;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CA+B5B"}

package/dist/core/api/client.js

@@ -1,82 +1,91 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendOtlpMetrics = sendOtlpMetrics;
+exports.sendOtlpLogs = sendOtlpLogs;
 exports.createTestPayload = createTestPayload;
 exports.generateTestSessionId = generateTestSessionId;
 exports.checkEndpointHealth = checkEndpointHealth;
 const loader_js_1 = require("../config/loader.js");
 /**
- * Sends an OTLP metrics payload to the Revenium endpoint.
- * Posts to /meter/v2/otel/v1/metrics with OTEL Metrics format.
+ * Sends an OTLP logs payload to the Revenium endpoint.
  */
-async function sendOtlpMetrics(baseEndpoint, apiKey, payload) {
+async function sendOtlpLogs(baseEndpoint, apiKey, payload) {
     const fullEndpoint = (0, loader_js_1.getFullOtlpEndpoint)(baseEndpoint);
-    const url = `${fullEndpoint}/v1/metrics`;
+    const url = `${fullEndpoint}/v1/logs`;
     const response = await fetch(url, {
-        method: 'POST',
+        method: "POST",
         headers: {
-            'Content-Type': 'application/json',
-            'x-api-key': apiKey,
+            "Content-Type": "application/json",
+            "x-api-key": apiKey,
         },
         body: JSON.stringify(payload),
     });
     if (!response.ok) {
         const errorText = await response.text();
-        throw new Error(`OTLP request failed: ${response.status} ${response.statusText} - ${errorText}`);
+        const safeErrorText = errorText.length > 200 ? errorText.substring(0, 200) + "..." : errorText;
+        throw new Error(`OTLP request failed: ${response.status} ${response.statusText} - ${safeErrorText}`);
     }
     return response.json();
 }
 /**
- * Creates a minimal test OTEL metrics payload.
+ * Creates a minimal test OTLP logs payload.
  */
 function createTestPayload(sessionId, options) {
     const now = Date.now() * 1_000_000; // Convert to nanoseconds
-    // Common attributes for all metrics
-    const commonAttributes = [
-        { key: 'ai.transaction_id', value: { stringValue: sessionId } },
-        { key: 'ai.model', value: { stringValue: 'cli-connectivity-test' } },
-        { key: 'ai.provider', value: { stringValue: 'anthropic' } },
+    // Build log record attributes
+    // Note: organization.name and product.name go here because ClaudeCodeMapper reads from log record attrs
+    const logAttributes = [
+        { key: "session.id", value: { stringValue: sessionId } },
+        { key: "model", value: { stringValue: "cli-connectivity-test" } },
+        { key: "input_tokens", value: { stringValue: "0" } },
+        { key: "output_tokens", value: { stringValue: "0" } },
+        { key: "cache_read_tokens", value: { stringValue: "0" } },
+        { key: "cache_creation_tokens", value: { stringValue: "0" } },
+        { key: "cost_usd", value: { stringValue: "0.0" } },
+        { key: "duration_ms", value: { stringValue: "0" } },
     ];
-    // Add optional organization ID
-    if (options?.organizationId) {
-        commonAttributes.push({ key: 'organization.id', value: { stringValue: options.organizationId } });
+    // Add optional subscriber/attribution attributes at log record level
+    // (backend ClaudeCodeMapper reads these from log record attrs, not resource attrs)
+    if (options?.email) {
+        logAttributes.push({
+            key: "user.email",
+            value: { stringValue: options.email },
+        });
     }
-    // Add optional product ID
-    if (options?.productId) {
-        commonAttributes.push({ key: 'product.id', value: { stringValue: options.productId } });
+    // Support both new (organizationName) and old (organizationId) field names with fallback
+    const organizationValue = options?.organizationName || options?.organizationId;
+    if (organizationValue) {
+        logAttributes.push({
+            key: "organization.name",
+            value: { stringValue: organizationValue },
+        });
     }
-    // Build resource attributes
-    const resourceAttributes = [
-        { key: 'service.name', value: { stringValue: 'claude-code' } },
-    ];
+    // Support both new (productName) and old (productId) field names with fallback
+    const productValue = options?.productName || options?.productId;
+    if (productValue) {
+        logAttributes.push({
+            key: "product.name",
+            value: { stringValue: productValue },
+        });
+    }
+    // Build resource attributes (only service.name needed here)
+    const resourceAttributes = [{ key: "service.name", value: { stringValue: "claude-code" } }];
     return {
-        resourceMetrics: [
+        resourceLogs: [
             {
                 resource: {
                     attributes: resourceAttributes,
                 },
-                scopeMetrics: [
+                scopeLogs: [
                     {
-                        metrics: [
-                            {
-                                name: 'ai.tokens.input',
-                                sum: {
-                                    dataPoints: [{
-                                            attributes: commonAttributes,
-                                            timeUnixNano: now.toString(),
-                                            asInt: 0,
-                                        }],
-                                },
-                            },
+                        scope: {
+                            name: "claude_code",
+                            version: "0.1.0",
+                        },
+                        logRecords: [
                             {
-                                name: 'ai.tokens.output',
-                                sum: {
-                                    dataPoints: [{
-                                            attributes: commonAttributes,
-                                            timeUnixNano: now.toString(),
-                                            asInt: 0,
-                                        }],
-                                },
+                                timeUnixNano: now.toString(),
+                                body: { stringValue: "claude_code.api_request" },
+                                attributes: logAttributes,
                             },
                         ],
                     },
@@ -101,18 +110,18 @@ async function checkEndpointHealth(baseEndpoint, apiKey, options) {
     try {
         const sessionId = generateTestSessionId();
         const payload = createTestPayload(sessionId, options);
-        const response = await sendOtlpMetrics(baseEndpoint, apiKey, payload);
+        const response = await sendOtlpLogs(baseEndpoint, apiKey, payload);
         const latencyMs = Date.now() - startTime;
         return {
             healthy: true,
             statusCode: 200,
-            message: `Endpoint healthy. Processed ${response.processedMetrics} metric(s).`,
+            message: `Endpoint healthy. Processed ${response.processedEvents} event(s).`,
             latencyMs,
         };
     }
     catch (error) {
         const latencyMs = Date.now() - startTime;
-        const message = error instanceof Error ? error.message : 'Unknown error';
+        const message = error instanceof Error ? error.message : "Unknown error";
         // Try to extract status code from error message
         const statusMatch = message.match(/(\d{3})/);
         const statusCode = statusMatch ? parseInt(statusMatch[1], 10) : undefined;

package/dist/core/api/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/core/api/client.ts"],"names":[],"mappings":";;AAOA,0CAuBC;AAeD,8CA4DC;AAKD,sDAIC;AAKD,kDAmCC;AAzJD,mDAA0D;AAE1D;;;GAGG;AACI,KAAK,UAAU,eAAe,CACnC,YAAoB,EACpB,MAAc,EACd,OAA2B;IAE3B,MAAM,YAAY,GAAG,IAAA,+BAAmB,EAAC,YAAY,CAAC,CAAC;IACvD,MAAM,GAAG,GAAG,GAAG,YAAY,aAAa,CAAC;IAEzC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,WAAW,EAAE,MAAM;SACpB;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;KAC9B,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,MAAM,SAAS,EAAE,CAAC,CAAC;IACnG,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,EAA2B,CAAC;AAClD,CAAC;AAYD;;GAEG;AACH,SAAgB,iBAAiB,CAAC,SAAiB,EAAE,OAA4B;IAC/E,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,yBAAyB;IAE7D,oCAAoC;IACpC,MAAM,gBAAgB,GAA2D;QAC/E,EAAE,GAAG,EAAE,mBAAmB,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE;QAC/D,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,uBAAuB,EAAE,EAAE;QACpE,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE;KAC5D,CAAC;IAEF,+BAA+B;IAC/B,IAAI,OAAO,EAAE,cAAc,EAAE,CAAC;QAC5B,gBAAgB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IACpG,CAAC;IAED,0BAA0B;IAC1B,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;QACvB,gBAAgB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,4BAA4B;IAC5B,MAAM,kBAAkB,GAA2D;QACjF,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE;KAC/D,CAAC;IAEF,OAAO;QACL,eAAe,EAAE;YACf;gBACE,QAAQ,EAAE;oBACR,UAAU,EAAE,kBAAkB;iBAC/B;gBACD,YAAY,EAAE;oBACZ;wBACE,OAAO,EAAE;4BACP;gCACE,IAAI,EAAE,iBAAiB;gCACvB,GAAG,EAAE;oCACH,UAAU,EAAE,CAAC;4CACX,UAAU,EAAE,gBAAgB;4CAC5B,YAAY,EAAE,GAAG,CAAC,QAAQ,EAAE;4CAC5B,KAAK,EAAE,CAAC;yCACT,CAAC;iCACH;6BACF;4BACD;gCACE,IAAI,EAAE,kBAAkB;gCACxB,GAAG,EAAE;oCACH,UAAU,EAAE,CAAC;4CACX,UAAU,EAAE,gBAAgB;4CAC5B,YAAY,EAAE,GAAG,CAAC,QAAQ,EAAE;4CAC5B,KAAK,EAAE,CAAC;yCACT,CAAC;iCACH;6BACF;yBACF;qBACF;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB;IACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,OAAO,QAAQ,SAAS,IAAI,MAAM,EAAE,CAAC;AACvC,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,mBAAmB,CACvC,YAAoB,EACpB,MAAc,EACd,OAA4B;IAE5B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;QAC1C,MAAM,OAAO,GAAG,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAEtE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAEzC,OAAO;YACL,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,+BAA+B,QAAQ,CAAC,gBAAgB,aAAa;YAC9E,SAAS;SACV,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QACzC,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;QAEzE,gDAAgD;QAChD,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1E,OAAO;YACL,OAAO,EAAE,KAAK;YACd,UAAU;YACV,OAAO;YACP,SAAS;SACV,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/core/api/client.ts"],"names":[],"mappings":"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"}

package/dist/core/config/loader.d.ts

@@ -1,4 +1,4 @@
-import type { ReveniumConfig } from '../../types/index.js';
+import type { ReveniumConfig } from "../../types/index.js";
 /**
  * Gets the path to the Revenium configuration file.
  */
@@ -7,6 +7,10 @@ export declare function getConfigPath(): string;
  * Checks if the configuration file exists.
  */
 export declare function configExists(): boolean;
+/**
+ * Parses an .env file content into key-value pairs.
+ */
+export declare function parseEnvContent(content: string): Record<string, string>;
 /**
  * Loads the Revenium configuration from the .env file.
  * Returns null if the file doesn't exist.
@@ -16,18 +20,6 @@ export declare function loadConfig(): Promise<ReveniumConfig | null>;
  * Checks if the environment variables are currently loaded in the shell.
  */
 export declare function isEnvLoaded(): boolean;
-/**
- * Migration status for config file updates.
- */
-export interface MigrationStatus {
-    needsMigration: boolean;
-    issues: string[];
-}
-/**
- * Checks if the config file needs migration from old format.
- * Detects: OTEL_LOGS_EXPORTER (should be OTEL_METRICS_EXPORTER)
- */
-export declare function checkMigrationStatus(): Promise<MigrationStatus>;
 /**
  * Gets the full OTLP endpoint URL from a base URL.
  */

package/dist/core/config/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAuED;;;GAGG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAmCjE;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,OAAO,CAKrC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,cAAc,EAAE,OAAO,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,eAAe,CAAC,CA4BrE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAI3D"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2CvE;AA4DD;;;GAGG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA4DjE;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,OAAO,CAKrC;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAI3D"}

package/dist/core/config/loader.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigPath = getConfigPath;
 exports.configExists = configExists;
+exports.parseEnvContent = parseEnvContent;
 exports.loadConfig = loadConfig;
 exports.isEnvLoaded = isEnvLoaded;
-exports.checkMigrationStatus = checkMigrationStatus;
 exports.getFullOtlpEndpoint = getFullOtlpEndpoint;
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
@@ -28,26 +28,33 @@ function configExists() {
  */
 function parseEnvContent(content) {
     const result = {};
-    for (const line of content.split('\n')) {
+    for (const line of content.split("\n")) {
         let trimmed = line.trim();
         // Skip empty lines and comments
-        if (!trimmed || trimmed.startsWith('#')) {
+        if (!trimmed || trimmed.startsWith("#")) {
             continue;
         }
         // Handle 'export' prefix
-        if (trimmed.startsWith('export ')) {
+        if (trimmed.startsWith("export ")) {
             trimmed = trimmed.substring(7).trim();
         }
-        const equalsIndex = trimmed.indexOf('=');
+        const equalsIndex = trimmed.indexOf("=");
         if (equalsIndex === -1) {
             continue;
         }
         const key = trimmed.substring(0, equalsIndex).trim();
         let value = trimmed.substring(equalsIndex + 1).trim();
-        // Remove surrounding quotes if present
+        // Remove surrounding quotes if present and unescape
         if ((value.startsWith('"') && value.endsWith('"')) ||
             (value.startsWith("'") && value.endsWith("'"))) {
             value = value.substring(1, value.length - 1);
+            // Unescape common shell escape sequences
+            value = value
+                .replace(/\\"/g, '"')
+                .replace(/\\'/g, "'")
+                .replace(/\\\$/g, "$")
+                .replace(/\\`/g, "`")
+                .replace(/\\\\/g, "\\");
         }
         result[key] = value;
     }
@@ -71,8 +78,8 @@ function extractBaseEndpoint(fullEndpoint) {
         // Remove the OTLP path suffix to get the base URL
         // Handle both old path (/meter/v2/ai/otlp) and new path (/meter/v2/otlp)
         const path = url.pathname;
-        if (path.includes('/meter/v2/otlp') || path.includes('/meter/v2/ai/otlp')) {
-            url.pathname = '';
+        if (path.includes("/meter/v2/otlp") || path.includes("/meter/v2/ai/otlp")) {
+            url.pathname = "";
         }
         return url.origin;
     }
@@ -80,6 +87,35 @@ function extractBaseEndpoint(fullEndpoint) {
         return fullEndpoint;
     }
 }
+/**
+ * Parses OTEL_RESOURCE_ATTRIBUTES value into key-value pairs.
+ * Format: "key1=value1,key2=value2"
+ */
+function parseOtelResourceAttributes(value) {
+    const result = {};
+    if (!value || typeof value !== "string")
+        return result;
+    const pairs = value.split(",");
+    for (const pair of pairs) {
+        const trimmed = pair.trim();
+        if (!trimmed)
+            continue;
+        const equalsIndex = trimmed.indexOf("=");
+        if (equalsIndex === -1)
+            continue;
+        const key = trimmed.substring(0, equalsIndex).trim();
+        let attrValue = trimmed.substring(equalsIndex + 1).trim();
+        try {
+            attrValue = decodeURIComponent(attrValue);
+        }
+        catch {
+            // If decoding fails, use raw value
+        }
+        if (key)
+            result[key] = attrValue;
+    }
+    return result;
+}
 /**
  * Loads the Revenium configuration from the .env file.
  * Returns null if the file doesn't exist.
@@ -90,25 +126,42 @@ async function loadConfig() {
         return null;
     }
     try {
-        const content = await (0, promises_1.readFile)(configPath, 'utf-8');
+        const content = await (0, promises_1.readFile)(configPath, "utf-8");
         const env = parseEnvContent(content);
-        const fullEndpoint = env[constants_js_1.ENV_VARS.OTLP_ENDPOINT] || '';
-        const headers = env[constants_js_1.ENV_VARS.OTLP_HEADERS] || '';
+        const fullEndpoint = env[constants_js_1.ENV_VARS.OTLP_ENDPOINT] || "";
+        const headers = env[constants_js_1.ENV_VARS.OTLP_HEADERS] || "";
         const apiKey = extractApiKeyFromHeaders(headers);
         if (!apiKey) {
             return null;
         }
         // Parse cost multiplier override if present
         const costMultiplierStr = env[constants_js_1.ENV_VARS.COST_MULTIPLIER];
-        const costMultiplierOverride = costMultiplierStr ? parseFloat(costMultiplierStr) : undefined;
+        const costMultiplierOverride = costMultiplierStr
+            ? parseFloat(costMultiplierStr)
+            : undefined;
+        // Parse OTEL_RESOURCE_ATTRIBUTES for org/product (primary source)
+        const resourceAttrsStr = env["OTEL_RESOURCE_ATTRIBUTES"] || "";
+        const resourceAttrs = parseOtelResourceAttributes(resourceAttrsStr);
+        // Support both .name (preferred) and .id (legacy), with fallback to standalone vars
+        // Priority: organizationName > organizationId > organization.name > organization.id > env var
+        const organizationName = resourceAttrs["organization.name"] ||
+            resourceAttrs["organization.id"] ||
+            env[constants_js_1.ENV_VARS.ORGANIZATION_ID];
+        const productName = resourceAttrs["product.name"] ||
+            resourceAttrs["product.id"] ||
+            env[constants_js_1.ENV_VARS.PRODUCT_ID];
         return {
             apiKey,
             endpoint: extractBaseEndpoint(fullEndpoint),
             email: env[constants_js_1.ENV_VARS.SUBSCRIBER_EMAIL],
             subscriptionTier: env[constants_js_1.ENV_VARS.SUBSCRIPTION],
-            costMultiplierOverride: costMultiplierOverride && !isNaN(costMultiplierOverride) ? costMultiplierOverride : undefined,
-            organizationId: env[constants_js_1.ENV_VARS.ORGANIZATION_ID],
-            productId: env[constants_js_1.ENV_VARS.PRODUCT_ID],
+            costMultiplierOverride: costMultiplierOverride !== undefined && !isNaN(costMultiplierOverride)
+                ? costMultiplierOverride
+                : undefined,
+            organizationName,
+            organizationId: organizationName, // Keep for backward compatibility
+            productName,
+            productId: productName, // Keep for backward compatibility
         };
     }
     catch {
@@ -119,44 +172,15 @@ async function loadConfig() {
  * Checks if the environment variables are currently loaded in the shell.
  */
 function isEnvLoaded() {
-    return (process.env[constants_js_1.ENV_VARS.TELEMETRY_ENABLED] === '1' &&
+    return (process.env[constants_js_1.ENV_VARS.TELEMETRY_ENABLED] === "1" &&
         !!process.env[constants_js_1.ENV_VARS.OTLP_ENDPOINT]);
 }
-/**
- * Checks if the config file needs migration from old format.
- * Detects: OTEL_LOGS_EXPORTER (should be OTEL_METRICS_EXPORTER)
- */
-async function checkMigrationStatus() {
-    const configPath = getConfigPath();
-    const issues = [];
-    if (!(0, node_fs_1.existsSync)(configPath)) {
-        return { needsMigration: false, issues: [] };
-    }
-    try {
-        const content = await (0, promises_1.readFile)(configPath, 'utf-8');
-        // Check for old OTEL_LOGS_EXPORTER (should be OTEL_METRICS_EXPORTER)
-        if (content.includes('OTEL_LOGS_EXPORTER')) {
-            issues.push('Config uses OTEL_LOGS_EXPORTER (should be OTEL_METRICS_EXPORTER)');
-        }
-        // Check for old endpoint path
-        if (content.includes('/meter/v2/ai/otlp')) {
-            issues.push('Config uses old endpoint path /meter/v2/ai/otlp (should be /meter/v2/otel)');
-        }
-        return {
-            needsMigration: issues.length > 0,
-            issues,
-        };
-    }
-    catch {
-        return { needsMigration: false, issues: [] };
-    }
-}
 /**
  * Gets the full OTLP endpoint URL from a base URL.
  */
 function getFullOtlpEndpoint(baseUrl) {
     // Remove trailing slash if present
-    const cleanUrl = baseUrl.replace(/\/$/, '');
+    const cleanUrl = baseUrl.replace(/\/$/, "");
     return `${cleanUrl}${constants_js_1.OTLP_PATH}`;
 }
 //# sourceMappingURL=loader.js.map

package/dist/core/config/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/core/config/loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/core/config/loader.ts"],"names":[],"mappings":"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"}