@ghl-ai/aw 0.1.73-beta.1 → 0.1.73-beta.3

package/commands/init.mjs

@@ -77,6 +77,19 @@ function writeHookManifestBestEffort(manifest, context) {
   }
 }
 
+function installAwUsageHooksBestEffort({ silent = false } = {}) {
+  ensureTelemetryConfig();
+
+  try {
+    if (!isDefaultRoutingEnabled(HOME, process.env)) return null;
+    const result = installAwUsageHooks();
+    return formatAwUsageHooksInstallReport(result);
+  } catch (e) {
+    if (!silent) fmt.note(`aw-usage hooks install: ${e.message}`, 'Telemetry');
+    return null;
+  }
+}
+
 function formatIntegrationStatusSummary(statuses, installedNow = []) {
   if (!statuses || statuses.length === 0) return null;
 
@@ -506,6 +519,8 @@ export async function initCommand(args) {
     if (cwd !== HOME) installLocalCommitHook(cwd);
     if (!silent) fmt.logStep(`IDE wired — ${chalk.bold(symlinks)} symlinks · ${chalk.bold(commands)} commands`);
 
+    const awUsageHooksReport = installAwUsageHooksBestEffort({ silent });
+
     // Write hook manifest after all hook installation is complete
     writeHookManifestBestEffort({ eccVersion: AW_ECC_TAG, awVersion: VERSION });
 
@@ -533,6 +548,7 @@ export async function initCommand(args) {
         '',
         `  ${chalk.green('✓')} Registry synced`,
         `  ${chalk.green('✓')} IDE refreshed — ${chalk.bold(symlinks)} symlinks · ${chalk.bold(commands)} commands`,
+        awUsageHooksReport ? `  ${chalk.green('✓')} ${awUsageHooksReport}` : null,
         removedLegacyStartupFiles.length > 0
           ? `  ${chalk.green('✓')} Removed ${removedLegacyStartupFiles.length} legacy repo startup file${removedLegacyStartupFiles.length > 1 ? 's' : ''}`
           : null,
@@ -680,25 +696,12 @@ export async function initCommand(args) {
   ];
   if (!silent) fmt.logStep(`IDE wired — ${chalk.bold(symlinks)} symlinks · ${chalk.bold(commands)} commands`);
 
-  // Ensure telemetry config exists (generates machine_id on first run)
-  ensureTelemetryConfig();
-
   // Install bundled aw-usage producer hooks into ~/.claude.
   // Copies the scripts + lib files and non-destructively merges 5 hook phases
   // (SessionStart, UserPromptSubmit, PostToolUse, PostToolUseFailure, Stop)
   // into ~/.claude/settings.json. Idempotent. After this, every Claude Code
   // session emits usage_events to the live telemetry API automatically.
-  let awUsageHooksReport = null;
-  try {
-    if (isDefaultRoutingEnabled(HOME, process.env)) {
-      const result = installAwUsageHooks();
-      awUsageHooksReport = formatAwUsageHooksInstallReport(result);
-    }
-  } catch (e) {
-    // Non-fatal — telemetry is observational. Surface the error in silent mode
-    // logs but don't block the install.
-    if (!silent) fmt.note(`aw-usage hooks install: ${e.message}`, 'Telemetry');
-  }
+  const awUsageHooksReport = installAwUsageHooksBestEffort({ silent });
 
   // Write hook manifest after all hook installation is complete, including
   // bundled usage hooks, so `aw nuke` can prune AW-managed settings entries.

package/hooks/aw-usage/hooks/aw-usage-commit-created.js

@@ -11,15 +11,23 @@
 
 'use strict';
 
-const { buildEvent, sendAsync, isDisabled } = require('../lib/aw-usage-telemetry');
+const {
+  buildEvent,
+  sendAsync,
+  isDisabled,
+  findRecentSdlcSessionForProject,
+} = require('../lib/aw-usage-telemetry');
 
 function buildCommitCreatedEvent({ commitHash = 'unknown', branch = 'unknown', cwd = process.cwd() } = {}) {
-  // Git hooks have no harness session context, but cwd lets buildEvent derive
-  // project_hash so the dashboard can correlate commits back to /aw:* sessions.
-  const event = buildEvent({ cwd }, 'commit_created', {
+  const linkedSession = findRecentSdlcSessionForProject(cwd);
+  const event = buildEvent({
+    cwd,
+    ...(linkedSession?.session_id ? { session_id: linkedSession.session_id } : {}),
+  }, 'commit_created', {
     commit_hash: commitHash,
     commit_sha: commitHash,
     branch,
+    ...(linkedSession?.session_id ? { linked_session_source: 'project_recent_sdlc_session' } : {}),
   });
 
   // Override harness to 'git' since this fires from a git hook, not a harness.

package/hooks/aw-usage/hooks/aw-usage-prompt-submit.js

@@ -109,7 +109,9 @@ function processPromptSubmitInput(input, deps = {}) {
 
   if (slash) {
     persistSkill(getSessionId(input), input?.turn_id || null, slash);
-    persistSlashCmd(getSessionId(input), slash);
+    persistSlashCmd(getSessionId(input), slash, {
+      cwd: input?.cwd || (input?.workspace_roots && input.workspace_roots[0]) || null,
+    });
     events.push({
       eventType: 'skill_invoked',
       payload: {

package/hooks/aw-usage/lib/aw-usage-telemetry.js

@@ -21,6 +21,7 @@ const SENDER_SCRIPT = path.join(__dirname, '..', 'hooks', 'aw-usage-telemetry-se
 const AW_HOME = path.join(os.homedir(), '.aw');
 const CONFIG_PATH = path.join(AW_HOME, 'telemetry', 'config.json');
 const SESSION_DIR = path.join(AW_HOME, 'telemetry', 'sessions');
+const SESSION_PROJECT_DIR = path.join(SESSION_DIR, 'by-project');
 const DEDUPE_DIR = path.join(os.tmpdir(), 'aw-usage-telemetry-dedupe');
 
 // ── Git config cache (once per process) ──────────────────────────────
@@ -157,6 +158,16 @@ function computeProjectHash(cwd) {
   return crypto.createHash('sha256').update(cwd).digest('hex').slice(0, 16);
 }
 
+function normalizeProjectHash(value) {
+  return typeof value === 'string' && /^[a-f0-9]{16}$/i.test(value) ? value.toLowerCase() : null;
+}
+
+function resolveProjectHash(context) {
+  if (!context || typeof context !== 'object') return null;
+  return normalizeProjectHash(context.project_hash || context.projectHash)
+    || computeProjectHash(context.cwd);
+}
+
 // ── Session file cleanup ─────────────────────────────────────────────
 // Prune session files older than SESSION_MAX_AGE_MS to prevent unbounded growth.
 // Called once per session start — best-effort, never blocks.
@@ -241,21 +252,40 @@ function readSessionSkill(sessionId, turnId) {
 // to the originating /aw:* invocation. Separate from `last_skill` because
 // the source is the prompt, not the tool, and the lifetime is the whole
 // session (not just one turn).
-function persistSessionSlashCommand(sessionId, slashCommand) {
+function writeProjectSessionIndex(projectHash, sessionId, slashCommand) {
+  if (!projectHash || !sessionId || !slashCommand?.is_sdlc_stage) return;
+  try {
+    fs.mkdirSync(SESSION_PROJECT_DIR, { recursive: true });
+    fs.writeFileSync(path.join(SESSION_PROJECT_DIR, `${projectHash}.json`), JSON.stringify({
+      project_hash: projectHash,
+      session_id: sessionId,
+      command_namespace: slashCommand.command_namespace || null,
+      command_name: slashCommand.command_name,
+      is_sdlc_stage: Boolean(slashCommand.is_sdlc_stage),
+      updated_at: new Date().toISOString(),
+    }));
+  } catch { /* ignore */ }
+}
+
+function persistSessionSlashCommand(sessionId, slashCommand, context = {}) {
   if (!sessionId || !slashCommand?.command_name) return;
   try {
     fs.mkdirSync(SESSION_DIR, { recursive: true });
     const state = readSessionState(sessionId);
+    const projectHash = resolveProjectHash(context) || state.project_hash || null;
     fs.writeFileSync(path.join(SESSION_DIR, sessionId + '.json'), JSON.stringify({
       ...state,
+      ...(projectHash ? { project_hash: projectHash } : {}),
       last_slash_command: {
         command_namespace: slashCommand.command_namespace || null,
         command_name: slashCommand.command_name,
         command_args: slashCommand.command_args || '',
         is_sdlc_stage: Boolean(slashCommand.is_sdlc_stage),
+        ...(projectHash ? { project_hash: projectHash } : {}),
         updated_at: new Date().toISOString(),
       },
     }));
+    writeProjectSessionIndex(projectHash, sessionId, slashCommand);
   } catch { /* ignore */ }
 }
 
@@ -265,6 +295,59 @@ function readSessionLastSlashCommand(sessionId) {
   return cmd;
 }
 
+function parseUpdatedAt(value) {
+  const millis = Date.parse(value || '');
+  return Number.isFinite(millis) ? millis : 0;
+}
+
+function isRecentSdlcSessionCandidate(candidate, projectHash, maxAgeMs) {
+  if (!candidate?.session_id) return false;
+  if (!candidate?.is_sdlc_stage) return false;
+  if (candidate.project_hash !== projectHash) return false;
+  const updatedAt = parseUpdatedAt(candidate.updated_at);
+  if (!updatedAt) return false;
+  return Date.now() - updatedAt <= maxAgeMs;
+}
+
+function readProjectSessionIndex(projectHash, maxAgeMs) {
+  try {
+    const candidate = JSON.parse(fs.readFileSync(path.join(SESSION_PROJECT_DIR, `${projectHash}.json`), 'utf8'));
+    return isRecentSdlcSessionCandidate(candidate, projectHash, maxAgeMs) ? candidate : null;
+  } catch {
+    return null;
+  }
+}
+
+function findRecentSdlcSessionForProject(cwd, maxAgeMs = SESSION_MAX_AGE_MS) {
+  const projectHash = computeProjectHash(cwd);
+  if (!projectHash) return null;
+
+  const indexed = readProjectSessionIndex(projectHash, maxAgeMs);
+  if (indexed) return indexed;
+
+  let best = null;
+  try {
+    const entries = fs.readdirSync(SESSION_DIR);
+    for (const entry of entries) {
+      if (!entry.endsWith('.json')) continue;
+      const sessionId = entry.slice(0, -'.json'.length);
+      const state = readSessionState(sessionId);
+      const cmd = state.last_slash_command;
+      const candidate = {
+        session_id: sessionId,
+        project_hash: cmd?.project_hash || state.project_hash || null,
+        is_sdlc_stage: Boolean(cmd?.is_sdlc_stage),
+        updated_at: cmd?.updated_at || state.updated_at || null,
+      };
+      if (!isRecentSdlcSessionCandidate(candidate, projectHash, maxAgeMs)) continue;
+      if (!best || parseUpdatedAt(candidate.updated_at) > parseUpdatedAt(best.updated_at)) {
+        best = candidate;
+      }
+    }
+  } catch { /* ignore */ }
+  return best;
+}
+
 // ── Short-TTL dedupe guards ──────────────────────────────────────────
 
 function normalizeDedupePart(value) {
@@ -503,6 +586,7 @@ module.exports = {
   readSessionSkill,
   persistSessionSlashCommand,
   readSessionLastSlashCommand,
+  findRecentSdlcSessionForProject,
   readLastAssistantFromTranscript,
   resolvePromptText,
   getAwCliVersionDetails,

package/package.json

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