@ghl-ai/aw 0.1.50-beta.1 → 0.1.50

package/link.mjs

@@ -16,11 +16,6 @@ const IDE_DIRS = ['.claude', '.cursor', '.codex'];
 const FILE_TYPES = ['agents'];
 const ALL_KNOWN_TYPES = new Set([...FILE_TYPES, 'skills', 'commands', 'evals', 'references', 'docs']);
 
-function realHomeDir() {
-  const rawHome = homedir();
-  try { return realpathSync(rawHome); } catch { return rawHome; }
-}
-
 /**
  * List namespace directories inside .aw_registry/ (skip dotfiles).
  */
@@ -82,7 +77,7 @@ function cleanIdeSymlinks(cwd) {
     cleanSymlinksRecursive(ideDir);
   }
   // Also clean .agents/skills/ (global only — Codex reads from ~/.agents/skills/)
-  const HOME = realHomeDir();
+  const HOME = homedir();
   if (cwd === HOME) {
     const agentsSkillsDir = join(cwd, '.agents', 'skills');
     if (existsSync(agentsSkillsDir)) cleanSymlinksRecursive(agentsSkillsDir);
@@ -125,156 +120,6 @@ function flatName(ns, name) {
   return `${ns}-${name}`;
 }
 
-function stripRegistryPrefix(input) {
-  return String(input || '')
-    .trim()
-    .replace(/\\/g, '/')
-    .replace(/\/SKILL\.md$/i, '')
-    .replace(/^.*?\.aw_registry\//, '')
-    .replace(/^\.\/+/, '')
-    .replace(/\/+$/, '');
-}
-
-export function normalizeSkillTarget(input) {
-  const normalized = stripRegistryPrefix(input);
-  const parts = normalized.split('/').filter(Boolean);
-  const skillIndex = parts.indexOf('skills');
-
-  if (skillIndex < 1 || skillIndex === parts.length - 1) {
-    throw new Error(`Skill target must look like <team>/<path>/skills/<name>: ${input}`);
-  }
-
-  if (parts.length !== skillIndex + 2) {
-    throw new Error(`Skill target must point at a skill folder, not a nested file: ${input}`);
-  }
-
-  const namespace = parts[0];
-  const segments = parts.slice(1, skillIndex);
-  const skill = parts[skillIndex + 1];
-  const registryPath = [namespace, ...segments, 'skills', skill].join('/');
-  const flat = [namespace, ...segments, skill].join('-');
-  return { namespace, segments, skill, registryPath, flat };
-}
-
-function cleanSkillSymlinks(cwd) {
-  for (const ide of IDE_DIRS) {
-    const skillsDir = join(cwd, ide, 'skills');
-    if (existsSync(skillsDir)) cleanSymlinksRecursive(skillsDir);
-    const referencesDir = join(cwd, ide, 'references');
-    if (existsSync(referencesDir)) cleanSymlinksRecursive(referencesDir);
-  }
-
-  if (cwd === realHomeDir()) {
-    const agentsSkillsDir = join(cwd, '.agents', 'skills');
-    if (existsSync(agentsSkillsDir)) cleanSymlinksRecursive(agentsSkillsDir);
-    const agentsReferencesDir = join(cwd, '.agents', 'references');
-    if (existsSync(agentsReferencesDir)) cleanSymlinksRecursive(agentsReferencesDir);
-  }
-}
-
-function linkOneSkill(cwd, awDir, target) {
-  const skillDir = join(awDir, target.namespace, ...target.segments, 'skills', target.skill);
-  if (!existsSync(skillDir) || !lstatSync(skillDir).isDirectory()) {
-    throw new Error(`Skill not found in registry: ${target.registryPath}`);
-  }
-
-  let created = 0;
-  for (const ide of IDE_DIRS) {
-    const linkDir = join(cwd, ide, 'skills');
-    mkdirSync(linkDir, { recursive: true });
-    const linkPath = join(linkDir, target.flat);
-    const relTarget = relative(linkDir, skillDir);
-    forceSymlink(relTarget, linkPath);
-    created++;
-  }
-
-  if (cwd === realHomeDir()) {
-    const agentsSkillsDir = join(cwd, '.agents', 'skills');
-    mkdirSync(agentsSkillsDir, { recursive: true });
-    const linkPath = join(agentsSkillsDir, target.flat);
-    const relTarget = relative(agentsSkillsDir, skillDir);
-    forceSymlink(relTarget, linkPath);
-    created++;
-  }
-
-  return created;
-}
-
-function linkReferenceFiles(cwd, awDir, namespaces = null) {
-  const allowedNamespaces = namespaces ? new Set(namespaces) : null;
-  const namespacesToLink = listNamespaceDirs(awDir)
-    .filter(ns => !allowedNamespaces || allowedNamespaces.has(ns));
-  let created = 0;
-
-  for (const ns of namespacesToLink) {
-    for (const { typeDirPath: referencesDir } of findNestedTypeDirs(join(awDir, ns), 'references')) {
-      for (const file of readdirSync(referencesDir).filter(f => !f.startsWith('.'))) {
-        const targetPath = join(referencesDir, file);
-        if (lstatSync(targetPath).isDirectory()) continue;
-
-        for (const ide of IDE_DIRS) {
-          const linkDir = join(cwd, ide, 'references');
-          mkdirSync(linkDir, { recursive: true });
-          const linkPath = join(linkDir, file);
-          const relTarget = relative(linkDir, targetPath);
-          try { forceSymlink(relTarget, linkPath); created++; } catch { /* best effort */ }
-        }
-
-        if (cwd === realHomeDir()) {
-          const agentsReferencesDir = join(cwd, '.agents', 'references');
-          mkdirSync(agentsReferencesDir, { recursive: true });
-          const linkPath = join(agentsReferencesDir, file);
-          const relTarget = relative(agentsReferencesDir, targetPath);
-          try { forceSymlink(relTarget, linkPath); created++; } catch { /* best effort */ }
-        }
-      }
-    }
-  }
-
-  return created;
-}
-
-/**
- * Create/refresh symlinks for specific skills only.
- *
- * Unlike linkWorkspace(), this does not walk every namespace. It can be used
- * by lean init flows to avoid exposing every registry skill to IDE runtimes.
- */
-export function linkSkills(cwd, skillTargets, awDirOverride = null, { silent = false, exclusive = false } = {}) {
-  try { cwd = realpathSync(cwd); } catch { /* use as-is */ }
-
-  const GLOBAL_AW_DIR = join(realHomeDir(), '.aw_registry');
-  let awDir = awDirOverride || getLocalRegistryDir(cwd, GLOBAL_AW_DIR);
-  try { awDir = realpathSync(awDir); } catch { /* use as-is if it doesn't exist */ }
-  if (!existsSync(awDir)) return 0;
-
-  const targets = [...new Map(skillTargets.map(input => {
-    const target = normalizeSkillTarget(input);
-    return [target.registryPath, target];
-  })).values()];
-
-  for (const target of targets) {
-    const skillDir = join(awDir, target.namespace, ...target.segments, 'skills', target.skill);
-    if (!existsSync(skillDir) || !lstatSync(skillDir).isDirectory()) {
-      throw new Error(`Skill not found in registry: ${target.registryPath}`);
-    }
-  }
-
-  if (exclusive) cleanSkillSymlinks(cwd);
-
-  let created = 0;
-  for (const target of targets) {
-    created += linkOneSkill(cwd, awDir, target);
-  }
-  created += linkReferenceFiles(cwd, awDir, targets.map(target => target.namespace));
-
-  if (created > 0 && !silent) {
-    fmt.logSuccess(`Linked ${created} targeted symlink${created > 1 ? 's' : ''}`);
-  }
-
-  return created;
-}
-
 /**
  * Create/refresh all IDE symlinks.
  *
@@ -295,7 +140,7 @@ export function linkWorkspace(cwd, awDirOverride = null, { silent = false } = {}
   // where $HOME may be /var/... but process.cwd() resolves to /private/var/...
   try { cwd = realpathSync(cwd); } catch { /* use as-is */ }
 
-  const GLOBAL_AW_DIR = join(realHomeDir(), '.aw_registry');
+  const GLOBAL_AW_DIR = join(homedir(), '.aw_registry');
   let awDir = awDirOverride || getLocalRegistryDir(cwd, GLOBAL_AW_DIR);
   try { awDir = realpathSync(awDir); } catch { /* use as-is if it doesn't exist */ }
   if (!existsSync(awDir)) return 0;
@@ -383,10 +228,25 @@ export function linkWorkspace(cwd, awDirOverride = null, { silent = false } = {}
 
   // Shared references: flatten namespace references into each IDE's references/
   // so links like ../../references/foo.md continue to work from flattened skill dirs.
-  created += linkReferenceFiles(cwd, awDir);
+  for (const ns of namespaces) {
+    for (const { typeDirPath: referencesDir } of findNestedTypeDirs(join(awDir, ns), 'references')) {
+      for (const file of readdirSync(referencesDir).filter(f => !f.startsWith('.'))) {
+        const targetPath = join(referencesDir, file);
+        if (lstatSync(targetPath).isDirectory()) continue;
+
+        for (const ide of IDE_DIRS) {
+          const linkDir = join(cwd, ide, 'references');
+          mkdirSync(linkDir, { recursive: true });
+          const linkPath = join(linkDir, file);
+          const relTarget = relative(linkDir, targetPath);
+          try { forceSymlink(relTarget, linkPath); created++; } catch { /* best effort */ }
+        }
+      }
+    }
+  }
 
   // Codex per-skill symlinks: ~/.agents/skills/<name> (global only)
-  if (cwd === realHomeDir()) {
+  if (cwd === homedir()) {
     const agentsSkillsDir = join(cwd, '.agents/skills');
     for (const ns of namespaces) {
       for (const { typeDirPath: skillsDir, segments } of findNestedTypeDirs(join(awDir, ns), 'skills')) {
@@ -400,6 +260,20 @@ export function linkWorkspace(cwd, awDirOverride = null, { silent = false } = {}
         }
       }
     }
+
+    const agentsReferencesDir = join(cwd, '.agents', 'references');
+    for (const ns of namespaces) {
+      for (const { typeDirPath: referencesDir } of findNestedTypeDirs(join(awDir, ns), 'references')) {
+        mkdirSync(agentsReferencesDir, { recursive: true });
+        for (const file of readdirSync(referencesDir).filter(f => !f.startsWith('.'))) {
+          const targetPath = join(referencesDir, file);
+          if (lstatSync(targetPath).isDirectory()) continue;
+          const linkPath = join(agentsReferencesDir, file);
+          const relTarget = relative(agentsReferencesDir, targetPath);
+          try { forceSymlink(relTarget, linkPath); created++; } catch { /* best effort */ }
+        }
+      }
+    }
   }
 
   // Commands: per-file symlinks (recursive for nested domain dirs)

package/mcp.mjs

@@ -1,72 +1,16 @@
 // mcp.mjs — MCP config generation for Claude Code, Cursor, and Codex (global ~/ configs)
 // Uses native Streamable HTTP — no bridge process needed.
 
-import { existsSync, writeFileSync, readFileSync, mkdirSync, renameSync } from 'node:fs';
+import { existsSync, writeFileSync, readFileSync, mkdirSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { createInterface } from 'node:readline';
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 import { homedir } from 'node:os';
-import { randomBytes } from 'node:crypto';
 import * as p from '@clack/prompts';
 import * as fmt from './fmt.mjs';
 
 const HOME = homedir();
 const DEFAULT_MCP_URL = 'https://services.leadconnectorhq.com/agentic-workspace/mcp';
-const MCP_PREFS_FILENAME = 'mcp-preferences.json';
-const ENABLED_MODE = 'enabled';
-const DISABLED_MODE = 'disabled';
-const DISABLE_MCP_ENV = 'AW_DISABLE_MCP';
-const MCP_SERVER_NAME = 'ghl-ai';
-
-function mcpPrefsPath(homeDir = HOME) {
-  return join(homeDir, '.aw', MCP_PREFS_FILENAME);
-}
-
-function readJson(filePath, fallback = {}) {
-  if (!existsSync(filePath)) return fallback;
-  try {
-    return JSON.parse(readFileSync(filePath, 'utf8'));
-  } catch {
-    // Malformed or unreadable JSON should behave like an absent optional config.
-    return fallback;
-  }
-}
-
-function writeJson(filePath, value) {
-  const dir = dirname(filePath);
-  mkdirSync(dir, { recursive: true });
-  const tmpPath = join(dir, `.${randomBytes(8).toString('hex')}.tmp`);
-  writeFileSync(tmpPath, `${JSON.stringify(value, null, 2)}\n`);
-  renameSync(tmpPath, filePath);
-}
-
-function envDisablesMcp(env = process.env) {
-  const value = String(env[DISABLE_MCP_ENV] || '').trim().toLowerCase();
-  return ['1', 'true', 'yes', 'on'].includes(value);
-}
-
-export function loadMcpPreferences(homeDir = HOME) {
-  const prefs = readJson(mcpPrefsPath(homeDir), {});
-  return {
-    mode: prefs.mode === DISABLED_MODE ? DISABLED_MODE : ENABLED_MODE,
-    updatedAt: typeof prefs.updatedAt === 'string' ? prefs.updatedAt : null,
-  };
-}
-
-export function saveMcpPreferences(mode, homeDir = HOME) {
-  const normalizedMode = mode === DISABLED_MODE ? DISABLED_MODE : ENABLED_MODE;
-  const next = {
-    mode: normalizedMode,
-    updatedAt: new Date().toISOString(),
-  };
-  writeJson(mcpPrefsPath(homeDir), next);
-  return next;
-}
-
-export function isMcpEnabled(homeDir = HOME, env = process.env) {
-  if (envDisablesMcp(env)) return false;
-  return loadMcpPreferences(homeDir).mode !== DISABLED_MODE;
-}
 
 /**
  * Auto-detect MCP server paths.
@@ -306,28 +250,11 @@ async function resolveClickUpToken(silent = false, cwd = process.cwd()) {
 }
 
 /**
- * Setup MCP configs globally for Claude Code, Cursor, and Codex.
+ * Setup MCP configs globally for Claude Code and Cursor.
  * Merges ghl-ai server into existing configs without overwriting other servers.
  * Returns list of file paths that were created or updated.
  */
 export async function setupMcp(cwd, namespace, { silent = false } = {}) {
-  const prefs = loadMcpPreferences(HOME);
-  if (prefs.mode === DISABLED_MODE) {
-    const removed = removeMcpConfig();
-    if (!silent) {
-      const reason = `${fmt.chalk.dim(mcpPrefsPath(HOME).replace(HOME, '~'))} is disabled`;
-      fmt.logInfo(`MCP disabled (${reason}); removed ${removed} AW-managed MCP config file${removed === 1 ? '' : 's'}`);
-    }
-    return [];
-  }
-
-  if (envDisablesMcp()) {
-    if (!silent) {
-      fmt.logInfo(`MCP disabled (${DISABLE_MCP_ENV}=1); skipping MCP config updates`);
-    }
-    return [];
-  }
-
   const paths = detectPaths();
   const updatedFiles = [];
 
@@ -359,13 +286,13 @@ export async function setupMcp(cwd, namespace, { silent = false } = {}) {
 
   // ── Claude Code: ~/.claude.json (global) ──
   const claudeJsonPath = join(HOME, '.claude.json');
-  if (mergeJsonMcpServer(claudeJsonPath, MCP_SERVER_NAME, ghlAiServerLocal)) {
+  if (mergeJsonMcpServer(claudeJsonPath, 'ghl-ai', ghlAiServerLocal)) {
     updatedFiles.push(claudeJsonPath);
   }
 
   // ── Cursor: ~/.cursor/mcp.json (global) ──
   const cursorMcpPath = join(HOME, '.cursor', 'mcp.json');
-  if (mergeJsonMcpServer(cursorMcpPath, MCP_SERVER_NAME, ghlAiServerLocal)) {
+  if (mergeJsonMcpServer(cursorMcpPath, 'ghl-ai', ghlAiServerLocal)) {
     updatedFiles.push(cursorMcpPath);
   }
 
@@ -375,11 +302,11 @@ export async function setupMcp(cwd, namespace, { silent = false } = {}) {
   // survives — without this, each re-init overwrites ~/.codex/config.toml
   // from the ECC source which doesn't have the ghl-ai block.
   const codexTomlPath = join(HOME, '.codex', 'config.toml');
-  if (mergeTomlMcpServer(codexTomlPath, MCP_SERVER_NAME, ghlAiServerLocal)) {
+  if (mergeTomlMcpServer(codexTomlPath, 'ghl-ai', ghlAiServerLocal)) {
     updatedFiles.push(codexTomlPath);
   }
   const eccCodexTomlPath = join(HOME, '.aw-ecc', '.codex', 'config.toml');
-  mergeTomlMcpServer(eccCodexTomlPath, MCP_SERVER_NAME, ghlAiServerLocal);
+  mergeTomlMcpServer(eccCodexTomlPath, 'ghl-ai', ghlAiServerLocal);
 
   // Deduplicate
   const unique = [...new Set(updatedFiles)];
@@ -399,6 +326,12 @@ export async function setupMcp(cwd, namespace, { silent = false } = {}) {
  * Called by `aw nuke`. Returns number of files modified.
  */
 export function removeMcpConfig() {
+  const targets = [
+    join(HOME, '.claude.json'),
+    join(HOME, '.cursor', 'mcp.json'),
+  ];
+
+  // Also clean legacy locations that older versions wrote to
   const jsonTargets = [
     join(HOME, '.claude.json'),
     join(HOME, '.cursor', 'mcp.json'),
@@ -412,8 +345,8 @@ export function removeMcpConfig() {
     if (!existsSync(filePath)) continue;
     try {
       const config = JSON.parse(readFileSync(filePath, 'utf8'));
-      if (!config.mcpServers?.[MCP_SERVER_NAME]) continue;
-      delete config.mcpServers[MCP_SERVER_NAME];
+      if (!config.mcpServers?.['ghl-ai']) continue;
+      delete config.mcpServers['ghl-ai'];
       if (Object.keys(config.mcpServers).length === 0) delete config.mcpServers;
       writeFileSync(filePath, JSON.stringify(config, null, 2) + '\n');
       removed++;
@@ -421,62 +354,13 @@ export function removeMcpConfig() {
   }
 
   // Codex: ~/.codex/config.toml (TOML format)
-  if (removeTomlMcpServer(join(HOME, '.codex', 'config.toml'), MCP_SERVER_NAME)) {
-    removed++;
-  }
-  if (removeTomlMcpServer(join(HOME, '.aw-ecc', '.codex', 'config.toml'), MCP_SERVER_NAME)) {
+  if (removeTomlMcpServer(join(HOME, '.codex', 'config.toml'), 'ghl-ai')) {
     removed++;
   }
 
   return removed;
 }
 
-function jsonMcpHealth(filePath) {
-  const server = readJson(filePath, {})?.mcpServers?.[MCP_SERVER_NAME];
-  const authorization = typeof server?.headers?.Authorization === 'string'
-    && server.headers.Authorization.trim().length > 0;
-  return {
-    path: filePath,
-    present: !!server,
-    url: typeof server?.url === 'string' && /^https?:\/\//.test(server.url),
-    authorization,
-  };
-}
-
-function tomlMcpHealth(filePath) {
-  if (!existsSync(filePath)) {
-    return { path: filePath, present: false, url: false, authorization: false };
-  }
-
-  try {
-    const content = readFileSync(filePath, 'utf8');
-    return {
-      path: filePath,
-      present: new RegExp(`\\[mcp_servers\\.${MCP_SERVER_NAME}\\]`).test(content),
-      url: new RegExp(`\\[mcp_servers\\.${MCP_SERVER_NAME}\\][\\s\\S]*?url\\s*=\\s*"https?:\\/\\/[^"]+"`).test(content),
-      authorization: new RegExp(`\\[mcp_servers\\.${MCP_SERVER_NAME}\\.headers\\][\\s\\S]*?Authorization\\s*=\\s*".+"`).test(content),
-    };
-  } catch {
-    // Unreadable TOML should behave like an absent optional MCP config.
-    return { path: filePath, present: false, url: false, authorization: false };
-  }
-}
-
-export function getMcpStatus(homeDir = HOME, env = process.env) {
-  const prefs = loadMcpPreferences(homeDir);
-  return {
-    ...prefs,
-    effectiveMode: isMcpEnabled(homeDir, env) ? ENABLED_MODE : DISABLED_MODE,
-    envDisableMcp: envDisablesMcp(env),
-    envDisableMcpName: DISABLE_MCP_ENV,
-    preferencesPath: mcpPrefsPath(homeDir),
-    claude: jsonMcpHealth(join(homeDir, '.claude.json')),
-    cursor: jsonMcpHealth(join(homeDir, '.cursor', 'mcp.json')),
-    codex: tomlMcpHealth(join(homeDir, '.codex', 'config.toml')),
-    eccCodex: tomlMcpHealth(join(homeDir, '.aw-ecc', '.codex', 'config.toml')),
-  };
-}
-
 // ── TOML helpers for Codex ~/.codex/config.toml ───────────────────────────
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.50-beta.1",
+  "version": "0.1.50",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {
@@ -17,6 +17,7 @@
     "fmt.mjs",
     "git.mjs",
     "glob.mjs",
+    "integrations/",
     "integrate.mjs",
     "link.mjs",
     "manifest.mjs",
@@ -34,7 +35,6 @@
     "hooks/",
     "startup.mjs",
     "ecc.mjs",
-    "integrations.mjs",
     "render-rules.mjs",
     "telemetry.mjs"
   ],
@@ -52,9 +52,9 @@
   "license": "MIT",
   "scripts": {
     "test": "yarn test:vitest && yarn test:node",
-    "test:vitest": "vitest run --reporter=verbose tests/commands tests/mcp.test.mjs tests/telemetry.test.mjs tests/c4 tests/integrations-graphify.test.mjs",
+    "test:vitest": "vitest run --reporter=verbose tests/commands tests/mcp.test.mjs tests/telemetry.test.mjs tests/c4",
     "test:node": "node tests/run-node-tests.mjs",
-    "test:watch": "vitest --reporter=verbose tests/commands tests/mcp.test.mjs tests/telemetry.test.mjs tests/c4 tests/integrations-graphify.test.mjs",
+    "test:watch": "vitest --reporter=verbose tests/commands tests/mcp.test.mjs tests/telemetry.test.mjs tests/c4",
     "preuninstall": "node bin.js nuke 2>/dev/null || true"
   },
   "publishConfig": {

package/render-rules.mjs

@@ -5,7 +5,6 @@ import { dirname, join, relative } from 'node:path';
 import { homedir } from 'node:os';
 import * as fmt from './fmt.mjs';
 import { RULES_RUNTIME_DIR } from './constants.mjs';
-import { isDefaultRoutingEnabled } from './startup.mjs';
 
 // The marker is placed AFTER the YAML frontmatter so Cursor/Markdown parsers
 // see the frontmatter at byte 0. Putting an HTML comment before --- breaks
@@ -213,24 +212,6 @@ function pruneStaleGeneratedRules(outputDir, expectedFilenames) {
   }
 }
 
-function defaultRoutingEnabled(options = {}) {
-  if (typeof options.defaultRoutingEnabled === 'boolean') {
-    return options.defaultRoutingEnabled;
-  }
-  return isDefaultRoutingEnabled(options.homeDir || homedir());
-}
-
-function cleanupRenderedRules(cwd, options = {}) {
-  pruneStaleGeneratedRules(join(cwd, '.cursor', 'rules'), new Set());
-  pruneStaleGeneratedRules(join(cwd, '.claude', 'rules', 'platform'), new Set());
-
-  const HOME = options.homeDir || homedir();
-  if (cwd !== HOME) {
-    pruneStaleGeneratedRules(join(HOME, '.cursor', 'rules'), new Set());
-    pruneStaleGeneratedRules(join(HOME, '.claude', 'rules', 'platform'), new Set());
-  }
-}
-
 function stackOverlaysEnabled(options = {}) {
   if (typeof options.enableStackOverlays === 'boolean') {
     return options.enableStackOverlays;
@@ -720,13 +701,8 @@ export function generateAgentsMdRulesSection(rulesDir, options = {}) {
  *   2. Returns sections for CLAUDE.md and AGENTS.md injection
  */
 export function renderRules(cwd, options = {}) {
-  if (!defaultRoutingEnabled(options)) {
-    cleanupRenderedRules(cwd, options);
-    return { cursorCount: 0, claudeCount: 0, claudeSection: '', agentsSection: '' };
-  }
-
   const rulesDir = resolveRulesSourceDir(cwd, options);
-  if (!rulesDir) return { cursorCount: 0, claudeCount: 0, claudeSection: '', agentsSection: '' };
+  if (!rulesDir) return { cursorCount: 0, claudeSection: '', agentsSection: '' };
 
   // Resolve applicable scopes for AGENTS.md / CLAUDE.md MUST-rule list.
   // Order: explicit option → .aw/config.json awRuleScopes → auto-detect.

package/startup.mjs

@@ -13,7 +13,6 @@ import {
 const STARTUP_PREFS_FILENAME = 'startup-preferences.json';
 const ENABLED_MODE = 'enabled';
 const DISABLED_MODE = 'disabled';
-const DISABLE_DEFAULT_ROUTING_ENV = 'AW_DISABLE_DEFAULT_ROUTING';
 
 const CLAUDE_DISABLE_DESCRIPTION = 'AW-managed override: disable automatic AW session routing';
 const CLAUDE_TELEMETRY_DESCRIPTION = 'AW usage telemetry';
@@ -543,35 +542,9 @@ function disableCodexStartup(homeDir = homedir()) {
   return updatedFiles;
 }
 
-function cursorSessionStartShellScriptUsesAwRouting(homeDir = homedir()) {
-  const scriptPath = join(homeDir, '.cursor', 'hooks', 'session-start.sh');
-  if (!existsSync(scriptPath)) return false;
-
-  try {
-    const content = readFileSync(scriptPath, 'utf8');
-    return content.includes('using-aw-skills/hooks/session-start.sh')
-      || content.includes('skills/using-aw-skills/hooks/session-start.sh');
-  } catch {
-    // Unreadable Cursor shell hook is safest to treat as non-AW managed.
-    return false;
-  }
-}
-
-function isManagedCursorSessionStartEntry(entry, homeDir = homedir()) {
+function isManagedCursorSessionStartEntry(entry) {
   const command = String(entry?.command || '');
-  if (command === CURSOR_SESSION_START_COMMAND || command.endsWith('.cursor/hooks/session-start.js')) {
-    return true;
-  }
-
-  if (command.includes('using-aw-skills/hooks/session-start.sh')) {
-    return true;
-  }
-
-  if (command.includes('.cursor/hooks/session-start.sh')) {
-    return cursorSessionStartShellScriptUsesAwRouting(homeDir);
-  }
-
-  return false;
+  return command === CURSOR_SESSION_START_COMMAND || command.endsWith('.cursor/hooks/session-start.js');
 }
 
 function hasCursorSessionStartScript(homeDir = homedir()) {
@@ -587,7 +560,7 @@ function disableCursorStartup(homeDir = homedir()) {
     return [];
   }
 
-  const filtered = config.hooks.sessionStart.filter(entry => !isManagedCursorSessionStartEntry(entry, homeDir));
+  const filtered = config.hooks.sessionStart.filter(entry => !isManagedCursorSessionStartEntry(entry));
   if (filtered.length === config.hooks.sessionStart.length) {
     return [];
   }
@@ -649,16 +622,6 @@ export function loadStartupPreferences(homeDir = homedir()) {
   };
 }
 
-function envDisablesDefaultRouting(env = process.env) {
-  const value = String(env[DISABLE_DEFAULT_ROUTING_ENV] || '').trim().toLowerCase();
-  return ['1', 'true', 'yes', 'on'].includes(value);
-}
-
-export function isDefaultRoutingEnabled(homeDir = homedir(), env = process.env) {
-  if (envDisablesDefaultRouting(env)) return false;
-  return loadStartupPreferences(homeDir).mode !== DISABLED_MODE;
-}
-
 export function saveStartupPreferences(mode, homeDir = homedir()) {
   const normalizedMode = mode === DISABLED_MODE ? DISABLED_MODE : ENABLED_MODE;
   const next = {
@@ -695,11 +658,11 @@ export function applyGlobalStartupMode(mode, homeDir = homedir()) {
   return [...new Set(updatedFiles)];
 }
 
-export function applyStoredStartupPreferences(homeDir = homedir(), env = process.env) {
-  return applyGlobalStartupMode(isDefaultRoutingEnabled(homeDir, env) ? ENABLED_MODE : DISABLED_MODE, homeDir);
+export function applyStoredStartupPreferences(homeDir = homedir()) {
+  return applyGlobalStartupMode(loadStartupPreferences(homeDir).mode, homeDir);
 }
 
-export function getStartupStatus(homeDir = homedir(), env = process.env) {
+export function getStartupStatus(homeDir = homedir()) {
   const prefs = loadStartupPreferences(homeDir);
   const claudeSettingsPath = join(homeDir, '.claude', 'settings.json');
   const codexHooksPath = join(homeDir, '.codex', 'hooks.json');
@@ -707,15 +670,9 @@ export function getStartupStatus(homeDir = homedir(), env = process.env) {
   const claudeSettings = readJson(claudeSettingsPath, {});
   const codexHooks = readJson(codexHooksPath, {});
   const cursorHooks = readJson(cursorHooksPath, {});
-  const cursorSessionStartEntries = Array.isArray(cursorHooks?.hooks?.sessionStart)
-    ? cursorHooks.hooks.sessionStart
-    : [];
 
   return {
     ...prefs,
-    effectiveMode: isDefaultRoutingEnabled(homeDir, env) ? ENABLED_MODE : DISABLED_MODE,
-    envDisableDefaultRouting: envDisablesDefaultRouting(env),
-    envDisableDefaultRoutingName: DISABLE_DEFAULT_ROUTING_ENV,
     preferencesPath: startupPrefsPath(homeDir),
     claudePluginEnabled: claudeSettings?.enabledPlugins?.['aw@aw-marketplace'] === true,
     claudePluginInstalled: hasClaudePluginCache(homeDir),
@@ -727,9 +684,8 @@ export function getStartupStatus(homeDir = homedir(), env = process.env) {
     codexSessionStartPresent: Array.isArray(codexHooks?.hooks?.SessionStart) &&
       codexHooks.hooks.SessionStart.some(isManagedCodexSessionStartEntry),
     codexSessionStartScriptInstalled: hasCodexSessionStartScript(homeDir),
-    cursorSessionStartPresent: cursorSessionStartEntries.some(entry =>
-      isManagedCursorSessionStartEntry(entry, homeDir)),
-    cursorAnySessionStartPresent: cursorSessionStartEntries.length > 0,
+    cursorSessionStartPresent: Array.isArray(cursorHooks?.hooks?.sessionStart) &&
+      cursorHooks.hooks.sessionStart.length > 0,
     cursorSessionStartScriptInstalled: hasCursorSessionStartScript(homeDir),
   };
 }