@scheduler-systems/gal-run 0.0.406 → 0.0.407

package/dist/postinstall.cjs

@@ -56,7 +56,7 @@ const cliVersion = cliPackageJson.version;
 
 // Version markers for idempotency checks
 // Bump these to force updates to installed files
-const HOOK_VERSION = '4.1.1'; // SessionStart hook (4.1.1: Fix dispatch backtick escaping in generated hook #4667)
+const HOOK_VERSION = '4.2.0'; // SessionStart + Stop hooks with local usage reporting (#4673)
 const STATUS_LINE_VERSION = '1.0.0'; // Status line script
 const RULES_VERSION = '1.0.0'; // GAL CLI rules
 
@@ -114,10 +114,12 @@ const fs = require('fs');
 const path = require('path');
 const { execSync, spawn } = require('child_process');
 const os = require('os');
+const crypto = require('crypto');
 
 const GAL_DIR = '.gal';
 const SYNC_STATE_FILE = 'sync-state.json';
 const GAL_CONFIG_FILE = path.join(os.homedir(), '.gal', 'config.json');
+const SESSION_USAGE_DIR = path.join(os.homedir(), '.gal', 'claude-session-usage');
 
 function showMessage(message, status) {
   // Queue telemetry event before showing message
@@ -156,7 +158,7 @@ function queueTelemetryEvent(status) {
 
   // Add session start hook event
   pending.push({
-    id: require('crypto').randomUUID(),
+    id: crypto.randomUUID(),
     eventType: 'hook_triggered',
     timestamp: new Date().toISOString(),
     payload: {
@@ -180,6 +182,45 @@ function queueTelemetryEvent(status) {
   }
 }
 
+function readHookInput() {
+  try {
+    if (process.stdin.isTTY) return {};
+    const raw = fs.readFileSync(0, 'utf-8');
+    if (!raw || !raw.trim()) return {};
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+
+function getSessionUsagePath(inputData) {
+  const identity =
+    (typeof inputData.session_id === 'string' && inputData.session_id) ||
+    (typeof inputData.transcript_path === 'string' && inputData.transcript_path) ||
+    process.cwd();
+  const sessionKey = crypto.createHash('sha256').update(identity).digest('hex');
+  return path.join(SESSION_USAGE_DIR, \`\${sessionKey}.json\`);
+}
+
+function rememberSessionStart(inputData) {
+  try {
+    const filePath = getSessionUsagePath(inputData);
+    if (!fs.existsSync(SESSION_USAGE_DIR)) {
+      fs.mkdirSync(SESSION_USAGE_DIR, { recursive: true });
+    }
+    fs.writeFileSync(
+      filePath,
+      JSON.stringify({
+        sessionId: inputData.session_id || null,
+        transcriptPath: inputData.transcript_path || null,
+        source: inputData.source || null,
+        startedAt: new Date().toISOString(),
+      }),
+      'utf-8',
+    );
+  } catch {}
+}
+
 // =============================================================================
 // Self-cleaning: Remove hook if GAL CLI is uninstalled
 // =============================================================================
@@ -209,7 +250,7 @@ function selfClean() {
   try {
     if (fs.existsSync(settingsPath)) {
       const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
-      const hookEvents = ['SessionStart', 'UserPromptSubmit'];
+      const hookEvents = ['SessionStart', 'Stop', 'UserPromptSubmit'];
 
       for (const event of hookEvents) {
         if (settings.hooks?.[event]) {
@@ -228,6 +269,9 @@ function selfClean() {
   } catch {}
 }
 
+const hookInput = readHookInput();
+rememberSessionStart(hookInput);
+
 // Check if GAL is installed, self-clean if not
 if (!isGalInstalled()) {
   selfClean();
@@ -423,6 +467,137 @@ try {
 showMessage(syncMessage, 'synced');
 `;
 
+const STOP_HOOK_CONTENT = `#!/usr/bin/env node
+/**
+ * GAL Local Usage Report Hook for Claude Code (Stop)
+ * Version: ${HOOK_VERSION}
+ */
+
+// GAL_HOOK_VERSION = "${HOOK_VERSION}"
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const crypto = require('crypto');
+const { execSync } = require('child_process');
+
+const SESSION_USAGE_DIR = path.join(os.homedir(), '.gal', 'claude-session-usage');
+const GAL_CONFIG_FILE = path.join(os.homedir(), '.gal', 'config.json');
+
+function readHookInput() {
+  try {
+    if (process.stdin.isTTY) return {};
+    const raw = fs.readFileSync(0, 'utf-8');
+    if (!raw || !raw.trim()) return {};
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+
+function getSessionUsagePath(inputData) {
+  const identity =
+    (typeof inputData.session_id === 'string' && inputData.session_id) ||
+    (typeof inputData.transcript_path === 'string' && inputData.transcript_path) ||
+    process.cwd();
+  const sessionKey = crypto.createHash('sha256').update(identity).digest('hex');
+  return path.join(SESSION_USAGE_DIR, \`\${sessionKey}.json\`);
+}
+
+function readGalConfig() {
+  if (!fs.existsSync(GAL_CONFIG_FILE)) return null;
+  try {
+    return JSON.parse(fs.readFileSync(GAL_CONFIG_FILE, 'utf-8'));
+  } catch { return null; }
+}
+
+function isGalInstalled() {
+  try {
+    execSync('which gal', { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function selfClean() {
+  const hookPath = __filename;
+  const claudeDir = path.join(os.homedir(), '.claude');
+  const settingsPath = path.join(claudeDir, 'settings.json');
+
+  try { fs.unlinkSync(hookPath); } catch {}
+
+  try {
+    if (fs.existsSync(settingsPath)) {
+      const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+      const hookEvents = ['SessionStart', 'Stop', 'UserPromptSubmit'];
+
+      for (const event of hookEvents) {
+        if (settings.hooks?.[event]) {
+          settings.hooks[event] = settings.hooks[event].filter(entry => {
+            if (!entry.hooks) return true;
+            entry.hooks = entry.hooks.filter(h => !h.command?.includes('gal-'));
+            return entry.hooks.length > 0;
+          });
+          if (settings.hooks[event].length === 0) delete settings.hooks[event];
+        }
+      }
+
+      if (Object.keys(settings.hooks || {}).length === 0) delete settings.hooks;
+      fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+    }
+  } catch {}
+}
+
+if (!isGalInstalled()) {
+  selfClean();
+  process.exit(0);
+}
+
+const hookInput = readHookInput();
+const usagePath = getSessionUsagePath(hookInput);
+
+if (!fs.existsSync(usagePath)) {
+  process.exit(0);
+}
+
+let startedAt = null;
+try {
+  const sessionState = JSON.parse(fs.readFileSync(usagePath, 'utf-8'));
+  startedAt = sessionState.startedAt || null;
+} catch {}
+
+try {
+  fs.unlinkSync(usagePath);
+} catch {}
+
+if (!startedAt) {
+  process.exit(0);
+}
+
+const startedMs = new Date(startedAt).getTime();
+if (!Number.isFinite(startedMs) || startedMs <= 0) {
+  process.exit(0);
+}
+
+const durationSeconds = Math.max(1, Math.round((Date.now() - startedMs) / 1000));
+const galConfig = readGalConfig();
+const orgName = galConfig?.defaultOrg;
+
+if (!orgName) {
+  process.exit(0);
+}
+
+try {
+  execSync(
+    \`gal report-usage --provider claude --seconds \${durationSeconds} --org \${JSON.stringify(orgName)} --json\`,
+    { stdio: 'pipe', timeout: 15000, shell: true },
+  );
+} catch {}
+
+process.exit(0);
+`;
+
 // =============================================================================
 // Status Line Script Content
 // =============================================================================
@@ -615,6 +790,7 @@ function installHook() {
   const claudeDir = path.join(os.homedir(), '.claude');
   const hooksDir = path.join(claudeDir, 'hooks');
   const hookPath = path.join(hooksDir, 'gal-sync-reminder.js');
+  const stopHookPath = path.join(hooksDir, 'gal-usage-report.js');
   const settingsPath = path.join(claudeDir, 'settings.json');
 
   try {
@@ -632,12 +808,24 @@ function installHook() {
         needsUpdate = false;
       }
     }
+    let needsStopUpdate = true;
+    if (fs.existsSync(stopHookPath)) {
+      const existingContent = fs.readFileSync(stopHookPath, 'utf-8');
+      const versionMatch = existingContent.match(/GAL_HOOK_VERSION = "([^"]+)"/);
+      if (versionMatch && versionMatch[1] === HOOK_VERSION) {
+        needsStopUpdate = false;
+      }
+    }
 
     // Write the hook file if needed
     if (needsUpdate) {
       fs.writeFileSync(hookPath, HOOK_CONTENT, 'utf-8');
       fs.chmodSync(hookPath, '755');
     }
+    if (needsStopUpdate) {
+      fs.writeFileSync(stopHookPath, STOP_HOOK_CONTENT, 'utf-8');
+      fs.chmodSync(stopHookPath, '755');
+    }
 
     // Update settings.json
     let settings = {};
@@ -669,22 +857,31 @@ function installHook() {
     const hookCommand = `node ${hookPath}`;
     if (!settings.hooks) settings.hooks = {};
     if (!settings.hooks.SessionStart) settings.hooks.SessionStart = [];
+    if (!settings.hooks.Stop) settings.hooks.Stop = [];
 
     const alreadyRegistered = settings.hooks.SessionStart.some(entry =>
       entry.hooks?.some(h => h.command?.includes('gal-sync-reminder'))
     );
+    const stopAlreadyRegistered = settings.hooks.Stop.some(entry =>
+      entry.hooks?.some(h => h.command?.includes('gal-usage-report'))
+    );
 
     if (!alreadyRegistered) {
       settings.hooks.SessionStart.push({
         hooks: [{ type: 'command', command: hookCommand }]
       });
     }
+    if (!stopAlreadyRegistered) {
+      settings.hooks.Stop.push({
+        hooks: [{ type: 'command', command: `node ${stopHookPath}` }]
+      });
+    }
 
     // Write settings
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf-8');
 
-    if (needsUpdate) {
-      console.log('✓ GAL SessionStart hook installed');
+    if (needsUpdate || needsStopUpdate) {
+      console.log('✓ GAL Claude hooks installed');
     }
     return true;
   } catch (error) {

package/dist/preuninstall.cjs

@@ -45,7 +45,7 @@ const os = require('os');
  * This function surgically removes only GAL-specific hook entries while
  * preserving the user's other hooks and settings. It handles:
  * - Filtering GAL hooks from UserPromptSubmit array
- * - Filtering GAL hooks from SessionStart array (v2.x)
+ * - Filtering GAL hooks from SessionStart and Stop arrays
  * - Removing empty hook arrays after filtering
  * - Preserving the settings.json file structure
  *
@@ -60,24 +60,31 @@ function removeGalHookEntries(settingsPath) {
 
     const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
 
-    if (!settings.hooks?.UserPromptSubmit) {
+    if (!settings.hooks) {
       return false;
     }
 
-    // Filter out GAL hooks while preserving user's other hooks
-    const originalLength = settings.hooks.UserPromptSubmit.length;
-    settings.hooks.UserPromptSubmit = settings.hooks.UserPromptSubmit.filter((entry) => {
-      if (!entry.hooks) return true;
-      // Keep entry only if it has non-GAL hooks
-      entry.hooks = entry.hooks.filter((hook) =>
-        !hook.command?.includes('gal-') && !hook.command?.includes('/gal/')
-      );
-      return entry.hooks.length > 0;
-    });
-
-    // Remove empty hooks array
-    if (settings.hooks.UserPromptSubmit.length === 0) {
-      delete settings.hooks.UserPromptSubmit;
+    let removedAny = false;
+
+    for (const event of ['UserPromptSubmit', 'SessionStart', 'Stop']) {
+      if (!settings.hooks[event]) continue;
+
+      const originalLength = settings.hooks[event].length;
+      settings.hooks[event] = settings.hooks[event].filter((entry) => {
+        if (!entry.hooks) return true;
+        entry.hooks = entry.hooks.filter((hook) =>
+          !hook.command?.includes('gal-') && !hook.command?.includes('/gal/')
+        );
+        return entry.hooks.length > 0;
+      });
+
+      if (settings.hooks[event].length === 0) {
+        delete settings.hooks[event];
+      }
+
+      if ((settings.hooks[event]?.length || 0) !== originalLength) {
+        removedAny = true;
+      }
     }
 
     // Remove empty hooks object
@@ -85,7 +92,7 @@ function removeGalHookEntries(settingsPath) {
       delete settings.hooks;
     }
 
-    if (settings.hooks?.UserPromptSubmit?.length !== originalLength) {
+    if (removedAny) {
       fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
       return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scheduler-systems/gal-run",
-  "version": "0.0.406",
+  "version": "0.0.407",
   "description": "GAL CLI - Command-line tool for managing AI agent configurations across your organization",
   "license": "Elastic-2.0",
   "private": false,

package/scripts/postinstall.cjs

@@ -56,7 +56,7 @@ const cliVersion = cliPackageJson.version;
 
 // Version markers for idempotency checks
 // Bump these to force updates to installed files
-const HOOK_VERSION = '4.1.1'; // SessionStart hook (4.1.1: Fix dispatch backtick escaping in generated hook #4667)
+const HOOK_VERSION = '4.2.0'; // SessionStart + Stop hooks with local usage reporting (#4673)
 const STATUS_LINE_VERSION = '1.0.0'; // Status line script
 const RULES_VERSION = '1.0.0'; // GAL CLI rules
 
@@ -114,10 +114,12 @@ const fs = require('fs');
 const path = require('path');
 const { execSync, spawn } = require('child_process');
 const os = require('os');
+const crypto = require('crypto');
 
 const GAL_DIR = '.gal';
 const SYNC_STATE_FILE = 'sync-state.json';
 const GAL_CONFIG_FILE = path.join(os.homedir(), '.gal', 'config.json');
+const SESSION_USAGE_DIR = path.join(os.homedir(), '.gal', 'claude-session-usage');
 
 function showMessage(message, status) {
   // Queue telemetry event before showing message
@@ -156,7 +158,7 @@ function queueTelemetryEvent(status) {
 
   // Add session start hook event
   pending.push({
-    id: require('crypto').randomUUID(),
+    id: crypto.randomUUID(),
     eventType: 'hook_triggered',
     timestamp: new Date().toISOString(),
     payload: {
@@ -180,6 +182,45 @@ function queueTelemetryEvent(status) {
   }
 }
 
+function readHookInput() {
+  try {
+    if (process.stdin.isTTY) return {};
+    const raw = fs.readFileSync(0, 'utf-8');
+    if (!raw || !raw.trim()) return {};
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+
+function getSessionUsagePath(inputData) {
+  const identity =
+    (typeof inputData.session_id === 'string' && inputData.session_id) ||
+    (typeof inputData.transcript_path === 'string' && inputData.transcript_path) ||
+    process.cwd();
+  const sessionKey = crypto.createHash('sha256').update(identity).digest('hex');
+  return path.join(SESSION_USAGE_DIR, \`\${sessionKey}.json\`);
+}
+
+function rememberSessionStart(inputData) {
+  try {
+    const filePath = getSessionUsagePath(inputData);
+    if (!fs.existsSync(SESSION_USAGE_DIR)) {
+      fs.mkdirSync(SESSION_USAGE_DIR, { recursive: true });
+    }
+    fs.writeFileSync(
+      filePath,
+      JSON.stringify({
+        sessionId: inputData.session_id || null,
+        transcriptPath: inputData.transcript_path || null,
+        source: inputData.source || null,
+        startedAt: new Date().toISOString(),
+      }),
+      'utf-8',
+    );
+  } catch {}
+}
+
 // =============================================================================
 // Self-cleaning: Remove hook if GAL CLI is uninstalled
 // =============================================================================
@@ -209,7 +250,7 @@ function selfClean() {
   try {
     if (fs.existsSync(settingsPath)) {
       const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
-      const hookEvents = ['SessionStart', 'UserPromptSubmit'];
+      const hookEvents = ['SessionStart', 'Stop', 'UserPromptSubmit'];
 
       for (const event of hookEvents) {
         if (settings.hooks?.[event]) {
@@ -228,6 +269,9 @@ function selfClean() {
   } catch {}
 }
 
+const hookInput = readHookInput();
+rememberSessionStart(hookInput);
+
 // Check if GAL is installed, self-clean if not
 if (!isGalInstalled()) {
   selfClean();
@@ -423,6 +467,137 @@ try {
 showMessage(syncMessage, 'synced');
 `;
 
+const STOP_HOOK_CONTENT = `#!/usr/bin/env node
+/**
+ * GAL Local Usage Report Hook for Claude Code (Stop)
+ * Version: ${HOOK_VERSION}
+ */
+
+// GAL_HOOK_VERSION = "${HOOK_VERSION}"
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const crypto = require('crypto');
+const { execSync } = require('child_process');
+
+const SESSION_USAGE_DIR = path.join(os.homedir(), '.gal', 'claude-session-usage');
+const GAL_CONFIG_FILE = path.join(os.homedir(), '.gal', 'config.json');
+
+function readHookInput() {
+  try {
+    if (process.stdin.isTTY) return {};
+    const raw = fs.readFileSync(0, 'utf-8');
+    if (!raw || !raw.trim()) return {};
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+
+function getSessionUsagePath(inputData) {
+  const identity =
+    (typeof inputData.session_id === 'string' && inputData.session_id) ||
+    (typeof inputData.transcript_path === 'string' && inputData.transcript_path) ||
+    process.cwd();
+  const sessionKey = crypto.createHash('sha256').update(identity).digest('hex');
+  return path.join(SESSION_USAGE_DIR, \`\${sessionKey}.json\`);
+}
+
+function readGalConfig() {
+  if (!fs.existsSync(GAL_CONFIG_FILE)) return null;
+  try {
+    return JSON.parse(fs.readFileSync(GAL_CONFIG_FILE, 'utf-8'));
+  } catch { return null; }
+}
+
+function isGalInstalled() {
+  try {
+    execSync('which gal', { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function selfClean() {
+  const hookPath = __filename;
+  const claudeDir = path.join(os.homedir(), '.claude');
+  const settingsPath = path.join(claudeDir, 'settings.json');
+
+  try { fs.unlinkSync(hookPath); } catch {}
+
+  try {
+    if (fs.existsSync(settingsPath)) {
+      const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+      const hookEvents = ['SessionStart', 'Stop', 'UserPromptSubmit'];
+
+      for (const event of hookEvents) {
+        if (settings.hooks?.[event]) {
+          settings.hooks[event] = settings.hooks[event].filter(entry => {
+            if (!entry.hooks) return true;
+            entry.hooks = entry.hooks.filter(h => !h.command?.includes('gal-'));
+            return entry.hooks.length > 0;
+          });
+          if (settings.hooks[event].length === 0) delete settings.hooks[event];
+        }
+      }
+
+      if (Object.keys(settings.hooks || {}).length === 0) delete settings.hooks;
+      fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+    }
+  } catch {}
+}
+
+if (!isGalInstalled()) {
+  selfClean();
+  process.exit(0);
+}
+
+const hookInput = readHookInput();
+const usagePath = getSessionUsagePath(hookInput);
+
+if (!fs.existsSync(usagePath)) {
+  process.exit(0);
+}
+
+let startedAt = null;
+try {
+  const sessionState = JSON.parse(fs.readFileSync(usagePath, 'utf-8'));
+  startedAt = sessionState.startedAt || null;
+} catch {}
+
+try {
+  fs.unlinkSync(usagePath);
+} catch {}
+
+if (!startedAt) {
+  process.exit(0);
+}
+
+const startedMs = new Date(startedAt).getTime();
+if (!Number.isFinite(startedMs) || startedMs <= 0) {
+  process.exit(0);
+}
+
+const durationSeconds = Math.max(1, Math.round((Date.now() - startedMs) / 1000));
+const galConfig = readGalConfig();
+const orgName = galConfig?.defaultOrg;
+
+if (!orgName) {
+  process.exit(0);
+}
+
+try {
+  execSync(
+    \`gal report-usage --provider claude --seconds \${durationSeconds} --org \${JSON.stringify(orgName)} --json\`,
+    { stdio: 'pipe', timeout: 15000, shell: true },
+  );
+} catch {}
+
+process.exit(0);
+`;
+
 // =============================================================================
 // Status Line Script Content
 // =============================================================================
@@ -615,6 +790,7 @@ function installHook() {
   const claudeDir = path.join(os.homedir(), '.claude');
   const hooksDir = path.join(claudeDir, 'hooks');
   const hookPath = path.join(hooksDir, 'gal-sync-reminder.js');
+  const stopHookPath = path.join(hooksDir, 'gal-usage-report.js');
   const settingsPath = path.join(claudeDir, 'settings.json');
 
   try {
@@ -632,12 +808,24 @@ function installHook() {
         needsUpdate = false;
       }
     }
+    let needsStopUpdate = true;
+    if (fs.existsSync(stopHookPath)) {
+      const existingContent = fs.readFileSync(stopHookPath, 'utf-8');
+      const versionMatch = existingContent.match(/GAL_HOOK_VERSION = "([^"]+)"/);
+      if (versionMatch && versionMatch[1] === HOOK_VERSION) {
+        needsStopUpdate = false;
+      }
+    }
 
     // Write the hook file if needed
     if (needsUpdate) {
       fs.writeFileSync(hookPath, HOOK_CONTENT, 'utf-8');
       fs.chmodSync(hookPath, '755');
     }
+    if (needsStopUpdate) {
+      fs.writeFileSync(stopHookPath, STOP_HOOK_CONTENT, 'utf-8');
+      fs.chmodSync(stopHookPath, '755');
+    }
 
     // Update settings.json
     let settings = {};
@@ -669,22 +857,31 @@ function installHook() {
     const hookCommand = `node ${hookPath}`;
     if (!settings.hooks) settings.hooks = {};
     if (!settings.hooks.SessionStart) settings.hooks.SessionStart = [];
+    if (!settings.hooks.Stop) settings.hooks.Stop = [];
 
     const alreadyRegistered = settings.hooks.SessionStart.some(entry =>
       entry.hooks?.some(h => h.command?.includes('gal-sync-reminder'))
     );
+    const stopAlreadyRegistered = settings.hooks.Stop.some(entry =>
+      entry.hooks?.some(h => h.command?.includes('gal-usage-report'))
+    );
 
     if (!alreadyRegistered) {
       settings.hooks.SessionStart.push({
         hooks: [{ type: 'command', command: hookCommand }]
       });
     }
+    if (!stopAlreadyRegistered) {
+      settings.hooks.Stop.push({
+        hooks: [{ type: 'command', command: `node ${stopHookPath}` }]
+      });
+    }
 
     // Write settings
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf-8');
 
-    if (needsUpdate) {
-      console.log('✓ GAL SessionStart hook installed');
+    if (needsUpdate || needsStopUpdate) {
+      console.log('✓ GAL Claude hooks installed');
     }
     return true;
   } catch (error) {