@ghl-ai/aw 0.1.37-beta.80 → 0.1.37-beta.81

package/commands/telemetry.mjs

@@ -15,10 +15,17 @@ import { join } from 'node:path';
 import { homedir } from 'node:os';
 import { AW_TELEMETRY_URL, TOKEN_PRICING } from '../constants.mjs';
 import { enableTelemetry, disableTelemetry, getStatus } from '../telemetry.mjs';
+import {
+  extractFromCodexSession,
+  handleSessionEnd,
+  handleSessionStart,
+  handleStop,
+} from '../hooks/capabilities/telemetry.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 
 const TIMEOUT_MS = 5000;
+const CODEX_SCAN_STATE_PATH = join(homedir(), '.aw', 'telemetry-codex-scan.json');
 
 function resolveGithubLogin() {
   const tokenPath = join(homedir(), '.aw_registry', '.token');
@@ -213,6 +220,8 @@ async function pushCommand(args) {
 // ── telemetry flush ──────────────────────────────────────────────────────────
 
 async function flushCommand(_args) {
+  await flushCodexSessionsForCwd(process.cwd());
+
   const cwd = process.cwd();
   const slug = cwd.replace(/\//g, '-');
   const sessionDir = join(homedir(), '.claude', 'projects', slug);
@@ -333,6 +342,109 @@ async function flushCommand(_args) {
   }
 }
 
+function readCodexScanState() {
+  if (!existsSync(CODEX_SCAN_STATE_PATH)) return {};
+  try { return JSON.parse(readFileSync(CODEX_SCAN_STATE_PATH, 'utf8')); } catch { return {}; }
+}
+
+function writeCodexScanState(state) {
+  writeFileSync(CODEX_SCAN_STATE_PATH, JSON.stringify(state, null, 2) + '\n', 'utf8');
+}
+
+function listCodexTranscriptFiles(root) {
+  if (!existsSync(root)) return [];
+  const stack = [root];
+  const files = [];
+
+  while (stack.length > 0) {
+    const dir = stack.pop();
+    let entries = [];
+    try {
+      entries = readdirSync(dir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+
+    for (const entry of entries) {
+      const fullPath = join(dir, entry.name);
+      if (entry.isDirectory()) {
+        stack.push(fullPath);
+      } else if (entry.isFile() && entry.name.endsWith('.jsonl')) {
+        files.push(fullPath);
+      }
+    }
+  }
+
+  return files;
+}
+
+async function flushCodexSessionsForCwd(cwd) {
+  const sessionsRoot = join(homedir(), '.codex', 'sessions');
+  const files = listCodexTranscriptFiles(sessionsRoot);
+  if (files.length === 0) return;
+
+  const state = readCodexScanState();
+  let flushed = 0;
+
+  for (const file of files) {
+    const match = file.match(/([0-9a-f]{8}-[0-9a-f-]{27,})\.jsonl$/i);
+    const sessionId = match?.[1];
+    if (!sessionId) continue;
+
+    let stat;
+    try {
+      stat = statSync(file);
+    } catch {
+      continue;
+    }
+
+    // Skip files that may still be actively written.
+    if (Date.now() - stat.mtimeMs < 15_000) continue;
+    if ((state[sessionId]?.mtimeMs || 0) >= stat.mtimeMs) continue;
+
+    const transcript = extractFromCodexSession(file);
+    if (!transcript || transcript.cwd !== cwd) continue;
+
+    await handleSessionStart({
+      session_id: sessionId,
+      platform: 'codex',
+      cwd,
+      transcript_path: file,
+      platform_version: transcript.platformVersion || null,
+      model: transcript.model || null,
+      start_ts: transcript.firstTimestamp || new Date(stat.mtimeMs).toISOString(),
+    });
+
+    await handleStop({
+      session_id: sessionId,
+      platform: 'codex',
+      cwd,
+      transcript_path: file,
+      platform_version: transcript.platformVersion || null,
+      model: transcript.model || null,
+      status: 'completed',
+    });
+
+    await handleSessionEnd({
+      session_id: sessionId,
+      keep_artifacts: true,
+    });
+
+    state[sessionId] = {
+      mtimeMs: stat.mtimeMs,
+      transcript_path: file,
+      flushed_at: new Date().toISOString(),
+      cwd,
+    };
+    flushed++;
+  }
+
+  if (flushed > 0) {
+    writeCodexScanState(state);
+    fmt.logSuccess(`Telemetry flushed ✓  (${flushed} Codex session${flushed === 1 ? '' : 's'})`);
+  }
+}
+
 /**
  * Sum token usage from JSONL files matching the given branch and time window.
  * Returns null if no matching data found or session is still active (<60s old).

package/hooks/capabilities/telemetry.mjs

@@ -210,7 +210,7 @@ function detectPlatform(input) {
   return 'claude-code';
 }
 
-function findCodexTranscriptPath(sessionId) {
+export function findCodexTranscriptPath(sessionId) {
   if (!sessionId || sessionId === 'unknown') return null;
 
   const sessionsRoot = join(HOME, '.codex', 'sessions');
@@ -475,7 +475,7 @@ function extractFromTranscript(transcriptPath) {
   }
 }
 
-function extractFromCodexSession(transcriptPath) {
+export function extractFromCodexSession(transcriptPath) {
   if (!transcriptPath || !existsSync(transcriptPath)) return null;
 
   try {
@@ -498,6 +498,8 @@ function extractFromCodexSession(transcriptPath) {
     let toolFailed = 0;
     let errorType = null;
     let errorMessage = null;
+    let firstTimestamp = null;
+    let lastTimestamp = null;
 
     for (const line of lines) {
       let entry;
@@ -507,6 +509,11 @@ function extractFromCodexSession(transcriptPath) {
         continue;
       }
 
+      if (entry.timestamp) {
+        if (!firstTimestamp) firstTimestamp = entry.timestamp;
+        lastTimestamp = entry.timestamp;
+      }
+
       if (entry.type === 'session_meta') {
         const meta = entry.payload || {};
         cwd = meta.cwd || cwd;
@@ -592,6 +599,8 @@ function extractFromCodexSession(transcriptPath) {
       prUrls: [...prUrls],
       errorType,
       errorMessage,
+      firstTimestamp,
+      lastTimestamp,
     };
   } catch {
     return null;
@@ -848,7 +857,7 @@ export async function handleSessionStart(rawInput) {
     platform: detectPlatform(rawInput),
     platform_version: input.platform_version || codexTranscript?.platformVersion || null,
     namespace: resolveNamespace(),
-    start_ts: new Date().toISOString(),
+    start_ts: input.start_ts || new Date().toISOString(),
     model: input.model || codexTranscript?.model || null,
     cwd,
     entry_id: 0,           // monotonic counter for costs.jsonl entries
@@ -1198,6 +1207,7 @@ export async function handleSessionEnd(rawInput) {
   const input = normalizeCursorInput(rawInput);
   const sessionId = input.session_id || 'unknown';
   const session = readSession(sessionId);
+  const keepArtifacts = Boolean(rawInput?.keep_artifacts || rawInput?.keepArtifacts);
   if (!session) return;
 
   // Flush offline queue first
@@ -1284,7 +1294,9 @@ export async function handleSessionEnd(rawInput) {
   }
 
   // ── Cleanup ──────────────────────────────────────────────────────────────
-  try { if (existsSync(costPath)) unlinkSync(costPath); } catch { /* best effort */ }
-  try { if (existsSync(snapshotPath(sessionId))) unlinkSync(snapshotPath(sessionId)); } catch { /* best effort */ }
-  try { if (existsSync(sessionPath(sessionId))) unlinkSync(sessionPath(sessionId)); } catch { /* best effort */ }
+  if (!keepArtifacts) {
+    try { if (existsSync(costPath)) unlinkSync(costPath); } catch { /* best effort */ }
+    try { if (existsSync(snapshotPath(sessionId))) unlinkSync(snapshotPath(sessionId)); } catch { /* best effort */ }
+    try { if (existsSync(sessionPath(sessionId))) unlinkSync(sessionPath(sessionId)); } catch { /* best effort */ }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.37-beta.80",
+  "version": "0.1.37-beta.81",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": "bin.js",