@respan/cli 0.5.0 → 0.5.2

package/dist/commands/integrate/claude-code.js

@@ -7,7 +7,7 @@ class IntegrateClaudeCode extends BaseCommand {
         const { flags } = await this.parse(IntegrateClaudeCode);
         this.globalFlags = flags;
         try {
-            // Verify the user is authenticated (key is read by hook from ~/.config/respan/)
+            // Verify the user is authenticated (key is read by hook from ~/.respan/)
             this.resolveApiKey();
             const baseUrl = flags['base-url'];
             const projectId = flags['project-id'];
@@ -93,7 +93,7 @@ class IntegrateClaudeCode extends BaseCommand {
                 const projectRoot = findProjectRoot();
                 const localSettingsPath = `${projectRoot}/.claude/settings.local.json`;
                 const localSettings = readJsonFile(localSettingsPath);
-                // settings.local.json: enable flag only (API key from ~/.config/respan/)
+                // settings.local.json: enable flag only (API key from ~/.respan/)
                 const envBlock = {
                     TRACE_TO_RESPAN: 'true',
                 };
@@ -150,7 +150,7 @@ class IntegrateClaudeCode extends BaseCommand {
                 this.log('Claude Code tracing enabled for this project.');
             }
             this.log('');
-            this.log('Auth:   ~/.config/respan/credentials.json  (from `respan auth login`)');
+            this.log('Auth:   ~/.respan/credentials.json  (from `respan auth login`)');
             this.log('Config: .claude/respan.json                (shareable, non-secret)');
             this.log('');
             this.log('Set properties via integrate flags or edit .claude/respan.json:');

package/dist/commands/integrate/codex-cli.js

@@ -33,17 +33,31 @@ class IntegrateCodexCli extends BaseCommand {
             }
             const otelResStr = toOtelResourceAttrs(resourceAttrs);
             // Build TOML block
+            const endpoint = `${baseUrl}/v2/traces`;
             const lines = [
                 '',
                 '# Respan observability (added by respan integrate codex-cli)',
                 '[otel]',
-                `endpoint = "${baseUrl}/v2/traces"`,
-                `api_key = "${apiKey}"`,
+                'log_user_prompt = true',
             ];
             if (otelResStr) {
                 lines.push(`resource_attributes = "${otelResStr}"`);
             }
             lines.push('');
+            lines.push('[otel.exporter."otlp-http"]');
+            lines.push(`endpoint = "${endpoint}"`);
+            lines.push('protocol = "binary"');
+            lines.push('');
+            lines.push('[otel.exporter."otlp-http".headers]');
+            lines.push(`"Authorization" = "Bearer ${apiKey}"`);
+            lines.push('');
+            lines.push('[otel.trace_exporter."otlp-http"]');
+            lines.push(`endpoint = "${endpoint}"`);
+            lines.push('protocol = "binary"');
+            lines.push('');
+            lines.push('[otel.trace_exporter."otlp-http".headers]');
+            lines.push(`"Authorization" = "Bearer ${apiKey}"`);
+            lines.push('');
             const block = lines.join('\n');
             const updated = existing.trimEnd() + '\n' + block;
             if (dryRun) {

package/dist/commands/integrate/gemini-cli.js

@@ -1,6 +1,6 @@
 import * as path from 'node:path';
 import { BaseCommand } from '../../lib/base-command.js';
-import { integrateFlags, deepMerge, readJsonFile, writeJsonFile, expandHome, parseAttrs, toOtelResourceAttrs, resolveScope, findProjectRoot, } from '../../lib/integrate.js';
+import { integrateFlags, deepMerge, readJsonFile, writeJsonFile, readTextFile, writeTextFile, expandHome, parseAttrs, toOtelResourceAttrs, resolveScope, findProjectRoot, } from '../../lib/integrate.js';
 class IntegrateGeminiCli extends BaseCommand {
     async run() {
         const { flags } = await this.parse(IntegrateGeminiCli);
@@ -25,27 +25,48 @@ class IntegrateGeminiCli extends BaseCommand {
             if (projectId) {
                 resourceAttrs['respan.project_id'] = projectId;
             }
+            // settings.json — only telemetry fields Gemini CLI supports
             const patch = {
                 telemetry: {
                     enabled: true,
                     otlpEndpoint: `${baseUrl}/v2/traces`,
-                    headers: {
-                        Authorization: `Bearer ${apiKey}`,
-                    },
+                    otlpProtocol: 'http',
                 },
             };
+            const merged = deepMerge(existing, patch);
+            // .env file — OTel SDK picks up headers & resource attrs from env
+            const envDir = scope === 'global'
+                ? expandHome('~/.gemini')
+                : path.join(findProjectRoot(), '.gemini');
+            const envPath = path.join(envDir, '.env');
+            const envLines = [];
+            envLines.push(`OTEL_EXPORTER_OTLP_HEADERS=Authorization=Bearer ${apiKey}`);
             const otelResStr = toOtelResourceAttrs(resourceAttrs);
             if (otelResStr) {
-                patch.env = { OTEL_RESOURCE_ATTRIBUTES: otelResStr };
+                envLines.push(`OTEL_RESOURCE_ATTRIBUTES=${otelResStr}`);
             }
-            const merged = deepMerge(existing, patch);
+            // Merge with existing .env (replace our keys, keep the rest)
+            const existingEnv = readTextFile(envPath);
+            const envKeysToSet = new Set(envLines.map(l => l.split('=')[0]));
+            const keptLines = existingEnv
+                .split('\n')
+                .filter(line => {
+                const key = line.split('=')[0];
+                return !envKeysToSet.has(key);
+            });
+            const finalEnv = [...keptLines.filter(l => l.trim() !== ''), ...envLines].join('\n') + '\n';
             if (dryRun) {
                 this.log(`[dry-run] Would update: ${settingsPath}`);
                 this.log(JSON.stringify(merged, null, 2));
+                this.log('');
+                this.log(`[dry-run] Would update: ${envPath}`);
+                this.log(finalEnv);
             }
             else {
                 writeJsonFile(settingsPath, merged);
                 this.log(`Updated settings: ${settingsPath}`);
+                writeTextFile(envPath, finalEnv);
+                this.log(`Updated env: ${envPath}`);
             }
             this.log('');
             this.log(`Gemini CLI integration complete (${scope}).`);

package/dist/lib/config.js

@@ -1,7 +1,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
-const CONFIG_DIR = path.join(os.homedir(), '.config', 'respan');
+const CONFIG_DIR = path.join(os.homedir(), '.respan');
 const CREDENTIALS_FILE = path.join(CONFIG_DIR, 'credentials.json');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 function ensureConfigDir() {