@ghl-ai/aw 0.1.42-beta.7 → 0.1.42-beta.9

package/commands/init.mjs

@@ -13,6 +13,7 @@ import {
   readFileSync,
   rmSync,
   realpathSync,
+  appendFileSync,
 } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { join, dirname, sep } from 'node:path';
@@ -87,65 +88,24 @@ function syncHomeAndProjectInstructions(cwd, namespace) {
   }
 }
 
-// ── Ensure ~/.aw/.git/info/exclude has the whitelist block ─────────────
-//
-// Strategy: only .aw_registry/, .aw_rules/, content/ are tracked — everything
-// else at the top level of ~/.aw/ is local-only (telemetry/, hooks/, logs,
-// .DS_Store, etc.). We write to .git/info/exclude (not tracked .gitignore)
-// so upstream pulls never conflict.
-
-const AW_MANAGED_BEGIN = '# BEGIN aw-managed (do not edit; managed by `aw init`)';
-const AW_MANAGED_END   = '# END aw-managed';
-
-const AW_MANAGED_BLOCK = [
-  AW_MANAGED_BEGIN,
-  '# Whitelist: only these top-level entries are tracked; everything else is local-only.',
-  '/*',
-  '!/.aw_registry',
-  '!/.aw_rules',
-  '!/content',
-  '',
-  '# Nested local state within whitelisted dirs',
-  '/.aw_registry/.sync-config.json',
-  AW_MANAGED_END,
-  '',
-].join('\n');
-
-// Legacy flat lines appended by earlier versions of ensureAwGitignore — strip on upgrade
-// so we don't leave stale rules lingering outside the managed block.
-const LEGACY_GITIGNORE_LINES = new Set([
+// ── Ensure ~/.aw/.gitignore has personal/local entries ───────────────────
+
+const AW_GITIGNORE_ENTRIES = [
   '.aw_registry/.sync-config.json',
   'hooks/',
-  '# aw: personal/local — do not commit',
-]);
-
-function escapeRegex(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
+];
 
-export function ensureAwGitignore(awHome) {
+function ensureAwGitignore(awHome) {
+  // Use .git/info/exclude so the tracked .gitignore stays clean
   const excludePath = join(awHome, '.git', 'info', 'exclude');
   let existing = '';
-  try { existing = readFileSync(excludePath, 'utf8'); } catch (err) { void err; /* doesn't exist yet */ }
-
-  // Strip any prior aw-managed block so re-rendering is idempotent.
-  const blockRegex = new RegExp(
-    `${escapeRegex(AW_MANAGED_BEGIN)}[\\s\\S]*?${escapeRegex(AW_MANAGED_END)}\\n?`,
-    'g'
-  );
-  const withoutManaged = existing.replace(blockRegex, '');
-
-  // Strip legacy flat lines (pre-whitelist implementation).
-  const cleaned = withoutManaged
-    .split('\n')
-    .filter(line => !LEGACY_GITIGNORE_LINES.has(line.trim()))
-    .join('\n');
-
-  const prefix = cleaned === '' || cleaned.endsWith('\n') ? cleaned : cleaned + '\n';
-  const next = prefix + AW_MANAGED_BLOCK;
-
-  if (next === existing) return; // already up to date
-  try { writeFileSync(excludePath, next); } catch (err) { void err; /* best effort */ }
+  try { existing = readFileSync(excludePath, 'utf8'); } catch { /* doesn't exist yet */ }
+  const missing = AW_GITIGNORE_ENTRIES.filter(e => !existing.includes(e));
+  if (missing.length === 0) return;
+  const block = (existing.endsWith('\n') || existing === '' ? '' : '\n')
+    + '# aw: personal/local — do not commit\n'
+    + missing.join('\n') + '\n';
+  try { appendFileSync(excludePath, block); } catch { /* best effort */ }
 }
 
 // ── IDE tasks for auto-pull ─────────────────────────────────────────────

package/ecc.mjs

@@ -10,7 +10,7 @@ import { applyStoredStartupPreferences } from "./startup.mjs";
 
 const AW_ECC_REPO_SSH = "git@github.com:shreyansh-ghl/aw-ecc.git";
 const AW_ECC_REPO_HTTPS = "https://github.com/shreyansh-ghl/aw-ecc.git";
-export const AW_ECC_TAG = "v1.4.38-beta.6";
+export const AW_ECC_TAG = "v1.4.38-beta.8";
 
 const MARKETPLACE_NAME = "aw-marketplace";
 const PLUGIN_KEY = `aw@${MARKETPLACE_NAME}`;

package/hooks/codex-home.mjs

@@ -46,27 +46,10 @@ const CODEX_HOME_PHASE_BLUEPRINTS = {
     scriptName: 'aw-user-prompt-submit.sh',
     scriptMarker: '# aw-managed: codex-global-user-prompt-submit',
     buildScriptContent() {
-      return `#!/usr/bin/env bash
-${this.scriptMarker}
-set -euo pipefail
-
-# Capture stdin so we can feed it to both the existing delegate and telemetry.
-STDIN=$(cat)
-
-# Fire telemetry in background (non-blocking).
-TELEMETRY_HOOK="$HOME/.aw-ecc/scripts/hooks/aw-usage-prompt-submit.js"
-if [[ -f "$TELEMETRY_HOOK" ]]; then
-  echo "$STDIN" | node "$TELEMETRY_HOOK" >/dev/null 2>&1 &
-fi
-
-# Delegate to existing rules-context hook.
-TARGET="$HOME/.aw-ecc/scripts/hooks/session-start-rules-context.sh"
-if [[ -f "$TARGET" ]]; then
-  echo "$STDIN" | exec bash "$TARGET"
-fi
-
-exit 0
-`;
+      return buildDelegatingPhaseScript({
+        marker: this.scriptMarker,
+        targetPath: '$HOME/.aw-ecc/scripts/hooks/session-start-rules-context.sh',
+      });
     },
     buildEntry(command) {
       return {
@@ -105,18 +88,11 @@ exit 0
     scriptName: 'aw-post-tool-use.sh',
     scriptMarker: '# aw-managed: codex-global-post-tool-use',
     buildScriptContent() {
-      return `#!/usr/bin/env bash
-${this.scriptMarker}
-set -euo pipefail
-
-# AW PostToolUse phase for Codex — usage telemetry.
-# Codex tool_name is always "Bash" — only PR and aw-push detection works.
-TELEMETRY_HOOK="$HOME/.aw-ecc/scripts/hooks/aw-usage-post-tool-use.js"
-if [[ -f "$TELEMETRY_HOOK" ]]; then
-  exec node "$TELEMETRY_HOOK"
-fi
-echo '{}'
-`;
+      return buildReservedPhaseScript({
+        marker: this.scriptMarker,
+        phase: 'PostToolUse',
+        harnessLabel: 'Codex home routing',
+      });
     },
     buildEntry(command) {
       return {
@@ -134,18 +110,11 @@ echo '{}'
     scriptName: 'aw-stop.sh',
     scriptMarker: '# aw-managed: codex-global-stop',
     buildScriptContent() {
-      return `#!/usr/bin/env bash
-${this.scriptMarker}
-set -euo pipefail
-
-# AW Stop phase for Codex — usage telemetry.
-# Codex Stop has last_assistant_message, stop_hook_active — no token usage.
-TELEMETRY_HOOK="$HOME/.aw-ecc/scripts/hooks/aw-usage-stop.js"
-if [[ -f "$TELEMETRY_HOOK" ]]; then
-  exec node "$TELEMETRY_HOOK"
-fi
-echo '{}'
-`;
+      return buildReservedPhaseScript({
+        marker: this.scriptMarker,
+        phase: 'Stop',
+        harnessLabel: 'Codex home routing',
+      });
     },
     buildEntry(command) {
       return {

package/package.json

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

package/startup.mjs

@@ -14,34 +14,6 @@ const ENABLED_MODE = 'enabled';
 const DISABLED_MODE = 'disabled';
 
 const CLAUDE_DISABLE_DESCRIPTION = 'AW-managed override: disable automatic AW session routing';
-const CLAUDE_TELEMETRY_DESCRIPTION = 'AW usage telemetry';
-const CLAUDE_TELEMETRY_HOOKS = [
-  {
-    phase: 'SessionStart',
-    matcher: undefined,
-    command: 'node "$HOME/.aw-ecc/scripts/hooks/aw-usage-session-start.js"',
-  },
-  {
-    phase: 'PostToolUse',
-    matcher: 'Skill|Agent|Shell|Bash',
-    command: 'node "$HOME/.aw-ecc/scripts/hooks/aw-usage-post-tool-use.js"',
-  },
-  {
-    phase: 'Stop',
-    matcher: undefined,
-    command: 'node "$HOME/.aw-ecc/scripts/hooks/aw-usage-stop.js"',
-  },
-  {
-    phase: 'PostToolUseFailure',
-    matcher: undefined,
-    command: 'node "$HOME/.aw-ecc/scripts/hooks/aw-usage-post-tool-use-failure.js"',
-  },
-  {
-    phase: 'UserPromptSubmit',
-    matcher: undefined,
-    command: 'node "$HOME/.aw-ecc/scripts/hooks/aw-usage-prompt-submit.js"',
-  },
-];
 const CURSOR_SESSION_START_COMMAND = 'node .cursor/hooks/session-start.js';
 const CURSOR_SESSION_START_DESCRIPTION = 'Load previous context and detect environment';
 const REPO_CURSOR_SESSION_START_COMMAND = 'bash "$(git rev-parse --show-toplevel)/hooks/aw-session-start"';
@@ -172,92 +144,6 @@ function hasCommandHook(entry, command) {
     );
 }
 
-function isManagedClaudeTelemetryEntry(entry) {
-  if (entry?.description === CLAUDE_TELEMETRY_DESCRIPTION) return true;
-  // Also match legacy entries (no description) by command pattern
-  const cmds = Array.isArray(entry?.hooks) ? entry.hooks.map(h => h?.command || '') : [];
-  return cmds.some(c => c.includes('aw-usage-'));
-}
-
-function buildClaudeTelemetryEntry(hookDef) {
-  const entry = {
-    hooks: [
-      {
-        type: 'command',
-        command: hookDef.command,
-      },
-    ],
-    description: CLAUDE_TELEMETRY_DESCRIPTION,
-  };
-  if (hookDef.matcher) {
-    entry.matcher = hookDef.matcher;
-  }
-  return entry;
-}
-
-function enableClaudeTelemetryHooks(homeDir = homedir()) {
-  const settingsPath = join(homeDir, '.claude', 'settings.json');
-  const config = readJson(settingsPath, {});
-  ensureHooksObject(config);
-
-  let changed = false;
-
-  for (const hookDef of CLAUDE_TELEMETRY_HOOKS) {
-    const current = Array.isArray(config.hooks[hookDef.phase]) ? config.hooks[hookDef.phase] : [];
-    const managed = current.filter(isManagedClaudeTelemetryEntry);
-
-    // If exactly one properly described entry exists, nothing to do
-    if (managed.length === 1 && managed[0].description === CLAUDE_TELEMETRY_DESCRIPTION) continue;
-
-    // Remove all legacy/duplicate telemetry entries, then add the canonical one
-    const cleaned = current.filter(e => !isManagedClaudeTelemetryEntry(e));
-    config.hooks[hookDef.phase] = [...cleaned, buildClaudeTelemetryEntry(hookDef)];
-    changed = true;
-  }
-
-  if (!changed) return [];
-
-  writeJson(settingsPath, config);
-  return [settingsPath];
-}
-
-function disableClaudeTelemetryHooks(homeDir = homedir()) {
-  const settingsPath = join(homeDir, '.claude', 'settings.json');
-  if (!existsSync(settingsPath)) return [];
-
-  const config = readJson(settingsPath, {});
-  if (!isObject(config.hooks)) return [];
-
-  let changed = false;
-
-  for (const hookDef of CLAUDE_TELEMETRY_HOOKS) {
-    const current = Array.isArray(config.hooks[hookDef.phase]) ? config.hooks[hookDef.phase] : null;
-    if (!current) continue;
-
-    const filtered = current.filter(entry => !isManagedClaudeTelemetryEntry(entry));
-    if (filtered.length !== current.length) {
-      changed = true;
-      if (filtered.length > 0) {
-        config.hooks[hookDef.phase] = filtered;
-      } else {
-        delete config.hooks[hookDef.phase];
-      }
-    }
-  }
-
-  if (!changed) return [];
-
-  if (isEmptyObject(config.hooks)) {
-    delete config.hooks;
-  }
-
-  if (!pruneEmptySettingsFile(settingsPath, config)) {
-    writeJson(settingsPath, config);
-  }
-
-  return [settingsPath];
-}
-
 function isManagedCodexSessionStartEntry(entry) {
   return isManagedCodexHomeEntry(entry, CODEX_SESSION_START_DEFINITION);
 }
@@ -604,12 +490,10 @@ export function applyGlobalStartupMode(mode, homeDir = homedir()) {
 
   if (normalizedMode === DISABLED_MODE) {
     updatedFiles.push(...disableClaudeStartup(homeDir));
-    updatedFiles.push(...disableClaudeTelemetryHooks(homeDir));
     updatedFiles.push(...disableCodexStartup(homeDir));
     updatedFiles.push(...disableCursorStartup(homeDir));
   } else {
     updatedFiles.push(...enableClaudeStartup(homeDir));
-    updatedFiles.push(...enableClaudeTelemetryHooks(homeDir));
     updatedFiles.push(...enableCodexStartup(homeDir));
     updatedFiles.push(...enableCursorStartup(homeDir));
   }

package/telemetry.mjs

@@ -7,7 +7,7 @@
 
 import { createHash, randomUUID } from 'node:crypto';
 import { hostname, userInfo, platform, arch, release } from 'node:os';
-import { readFileSync, writeFileSync, mkdirSync, existsSync, readdirSync, lstatSync, unlinkSync } from 'node:fs';
+import { readFileSync, writeFileSync, mkdirSync, existsSync, readdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { execSync } from 'node:child_process';
@@ -16,9 +16,7 @@ import { TELEMETRY_URL, AW_HOME } from './constants.mjs';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const VERSION = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf8')).version;
 
-const CONFIG_DIR         = join(AW_HOME, 'telemetry');
-const CONFIG_PATH        = join(CONFIG_DIR, 'config.json');
-const LEGACY_CONFIG_PATH = join(AW_HOME, '.telemetry');
+const CONFIG_PATH = join(AW_HOME, '.telemetry');
 
 // ── Config ──────────────────────────────────────────────────────────
 
@@ -32,15 +30,7 @@ export function loadConfig() {
     if (existsSync(CONFIG_PATH)) {
       return JSON.parse(readFileSync(CONFIG_PATH, 'utf8'));
     }
-    // One-time migration from legacy single-file shape (~/.aw/.telemetry).
-    // Only triggered when new path is missing, so re-running is a no-op.
-    if (existsSync(LEGACY_CONFIG_PATH) && lstatSync(LEGACY_CONFIG_PATH).isFile()) {
-      const legacy = JSON.parse(readFileSync(LEGACY_CONFIG_PATH, 'utf8'));
-      saveConfig(legacy);
-      try { unlinkSync(LEGACY_CONFIG_PATH); } catch (err) { void err; /* best-effort cleanup */ }
-      return legacy;
-    }
-  } catch (err) { void err; /* corrupt file — fall through to fresh config */ }
+  } catch { /* corrupt file — recreate */ }
 
   const config = {
     machine_id: generateMachineId(),