@ghl-ai/aw 0.1.41-beta.1 → 0.1.41-beta.2

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.37";
+export const AW_ECC_TAG = "v1.4.39-beta.1";
 
 const MARKETPLACE_NAME = "aw-marketplace";
 const PLUGIN_KEY = `aw@${MARKETPLACE_NAME}`;

package/package.json

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

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(),