aicp-tracker 1.2.3 → 1.2.5

package/bin/setup.js

@@ -139,16 +139,27 @@ async function main() {
       name: 'vcsUrl',
       message: 'VCS organisation URL (e.g. https://bitbucket.org/my-workspace or https://github.com/my-org)',
       initial: existing?.vcsUrl || '',
-      validate: v => /^https?:\/\/(bitbucket\.org|github\.com)\/.+/.test(v.trim())
-        ? true
-        : 'Must be https://bitbucket.org/<slug> or https://github.com/<slug>',
+      validate: v => {
+        try {
+          const url = new URL(v.trim());
+          if (!['bitbucket.org', 'github.com'].includes(url.hostname))
+            return 'Must be a bitbucket.org or github.com URL';
+          if (url.pathname.replace(/^\/+|\/+$/g, '').length === 0)
+            return 'Must include workspace/org slug (e.g. https://bitbucket.org/my-workspace)';
+          return true;
+        } catch {
+          return 'Enter a valid URL (e.g. https://bitbucket.org/my-workspace)';
+        }
+      },
     },
     {
       type: 'input',
       name: 'email',
       message: 'Your email used in Bitbucket / GitHub',
       initial: existing?.email || '',
-      validate: v => v.includes('@') ? true : 'Enter a valid email address',
+      validate: v => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v.trim().replace(/^[/\\]+|[/\\]+$/g, ''))
+        ? true
+        : 'Enter a valid email address (e.g. you@example.com)',
     },
     {
       type: 'select',
@@ -159,12 +170,14 @@ async function main() {
     },
   ]);
 
+  const normalizedEmail = answers.email.trim().replace(/^[/\\]+|[/\\]+$/g, '').toLowerCase();
+  const normalizedVcsUrl = answers.vcsUrl.trim().replace(/\/+$/, '');
   console.log('\n  Registering with AI Code Pulse server…');
-  const apiKey = await register(answers.email.trim());
+  const apiKey = await register(normalizedEmail);
 
   config.save({
-    vcsUrl: answers.vcsUrl.trim(),
-    email:  answers.email.trim(),
+    vcsUrl: normalizedVcsUrl,
+    email:  normalizedEmail,
     plan:   answers.plan,
     apiUrl: API_URL,
     apiKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicp-tracker",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "AI Code Pulse — Claude Code usage tracker for JIRA cost attribution",
   "main": "src/daemon.js",
   "bin": {

package/src/log-parser.js

@@ -44,6 +44,7 @@ function sumUsage(entries) {
   let serviceTier = null, speed = null;
   const models = new Set();
 
+  const uuids = [];
   for (const e of entries) {
     const u = e.message?.usage || {};
     input    += u.input_tokens                     || 0;
@@ -65,12 +66,13 @@ function sumUsage(entries) {
       }
     }
     if (e.message?.model) models.add(e.message.model);
+    if (e.uuid) uuids.push(e.uuid);
   }
-  return { input, cc, cr, out, ephUser, ephAsst, ephTool, webSearch, webFetch, serviceTier, speed, models };
+  return { input, cc, cr, out, ephUser, ephAsst, ephTool, webSearch, webFetch, serviceTier, speed, models, uuids };
 }
 
 function makeRecord(first, rootUuid, usage, filePaths) {
-  const { input, cc, cr, out, ephUser, ephAsst, ephTool, webSearch, webFetch, serviceTier, speed, models } = usage;
+  const { input, cc, cr, out, ephUser, ephAsst, ephTool, webSearch, webFetch, serviceTier, speed, models, uuids } = usage;
   return {
     sessionId:                        first.sessionId  || null,
     uuid:                             rootUuid,
@@ -92,6 +94,7 @@ function makeRecord(first, rootUuid, usage, filePaths) {
     enterprise_usd_per_token:         null,
     service_tier:                     serviceTier,
     speed:                            speed || (cc > 0 ? 'fast' : 'normal'),
+    trace_uuids:                      uuids.join(','),
   };
 }
 

package/src/sender.js

@@ -38,6 +38,7 @@ function buildPayload(cfg, records) {
       timestamp:                        rec.timestamp || null,
       gitBranch:                        rec.gitBranch,
       task_from_git_branch:             rec.task_from_git_branch || [],
+      trace_uuids:                      rec.trace_uuids || '',
     });
   }