@ghl-ai/aw 0.1.24 → 0.1.25-beta.1

package/apply.mjs

@@ -17,9 +17,14 @@ function writeConflictMarkers(filePath, localContent, registryContent) {
 /**
  * Apply actions to the workspace.
  * All actions are file-level (no directory-level operations).
- * Returns count of files with conflicts.
+ *
+ * @param {Array} actions
+ * @param {{ teamNS?: string }} opts
+ *   teamNS — when set, replaces all occurrences of `$TEAM_NS` in file content
+ *   with this value. Used when pulling [template] as a renamed team namespace.
+ * @returns {number} count of files with conflicts
  */
-export function applyActions(actions) {
+export function applyActions(actions, { teamNS } = {}) {
   let conflicts = 0;
 
   for (const act of actions) {
@@ -27,12 +32,18 @@ export function applyActions(actions) {
       case 'ADD':
       case 'UPDATE':
         mkdirSync(dirname(act.targetPath), { recursive: true });
-        cpSync(act.sourcePath, act.targetPath);
+        if (teamNS && act.sourcePath.endsWith('.md')) {
+          const content = readFileSync(act.sourcePath, 'utf8').replaceAll('$TEAM_NS', teamNS);
+          writeFileSync(act.targetPath, content);
+        } else {
+          cpSync(act.sourcePath, act.targetPath);
+        }
         break;
 
       case 'CONFLICT': {
         const local = existsSync(act.targetPath) ? readFileSync(act.targetPath, 'utf8') : '';
-        const registry = readFileSync(act.sourcePath, 'utf8');
+        let registry = readFileSync(act.sourcePath, 'utf8');
+        if (teamNS) registry = registry.replaceAll('$TEAM_NS', teamNS);
         mkdirSync(dirname(act.targetPath), { recursive: true });
         writeConflictMarkers(act.targetPath, local, registry);
         conflicts++;

package/cli.mjs

@@ -71,8 +71,8 @@ function printHelp() {
   const sec = (title) => `\n  ${chalk.bold.underline(title)}`;
   const help = [
     sec('Setup'),
-    cmd('aw init', 'Initialize workspace & pull ghl platform layer'),
-    cmd('aw init --namespace <team>', 'Init with ghl + team template'),
+    cmd('aw init --namespace <team>', 'Initialize workspace (required)'),
+    `  ${chalk.dim('Teams: revex, mobile, commerce, leadgen, crm, marketplace, ai')}`,
 
     sec('Download'),
     cmd('aw pull', 'Re-pull all synced paths (like git pull)'),

package/commands/drop.mjs

@@ -81,7 +81,7 @@ function deleteMatchingFiles(workspaceDir, path) {
 
 /**
  * Convert manifest key to registry path.
- * Manifest key now mirrors registry: "ghl/agents/architecture-reviewer.md" → "ghl/agents/architecture-reviewer"
+ * Manifest key now mirrors registry: "platform/agents/architecture-reviewer.md" → "platform/agents/architecture-reviewer"
  */
 function manifestKeyToRegistryPath(manifestKey) {
   return manifestKey.replace(/\.md$/, '');

package/commands/init.mjs

@@ -112,24 +112,45 @@ function saveManifest(data) {
 }
 
 
+const ALLOWED_NAMESPACES = ['revex', 'mobile', 'commerce', 'leadgen', 'crm', 'marketplace', 'ai'];
+
 export async function initCommand(args) {
   const namespace = args['--namespace'] || null;
   let user = args['--user'] || '';
+  const silent = args['--silent'] === true;
 
   fmt.intro(`aw init ${chalk.dim('v' + VERSION)}`);
 
   // ── Validate ──────────────────────────────────────────────────────────
 
-  if (namespace && !/^[a-z][a-z0-9-]{1,38}[a-z0-9]$/.test(namespace)) {
-    fmt.cancel(`Invalid namespace '${namespace}' — must match: ^[a-z][a-z0-9-]{1,38}[a-z0-9]$`);
+  if (!namespace && !silent) {
+    const list = ALLOWED_NAMESPACES.map(n => chalk.cyan(n)).join(', ');
+    fmt.cancel([
+      `Missing required ${chalk.bold('--namespace')} flag`,
+      '',
+      `  ${chalk.dim('Usage:')}  aw init --namespace <team>`,
+      `  ${chalk.dim('Teams:')}  ${list}`,
+      '',
+      `  ${chalk.dim('Example:')} ${chalk.bold('aw init --namespace commerce')}`,
+    ].join('\n'));
   }
 
-  if (namespace === 'ghl') {
-    fmt.cancel("'ghl' is a reserved namespace — it is the shared platform layer");
+  if (namespace && !ALLOWED_NAMESPACES.includes(namespace)) {
+    const list = ALLOWED_NAMESPACES.map(n => chalk.cyan(n)).join(', ');
+    fmt.cancel([
+      `Unknown namespace ${chalk.red(namespace)}`,
+      '',
+      `  ${chalk.dim('Allowed:')} ${list}`,
+      '',
+      `  ${chalk.dim('Example:')} ${chalk.bold('aw init --namespace commerce')}`,
+    ].join('\n'));
+  }
+
+  if (namespace && !/^[a-z][a-z0-9-]{1,38}[a-z0-9]$/.test(namespace)) {
+    fmt.cancel(`Invalid namespace '${namespace}' — must match: ^[a-z][a-z0-9-]{1,38}[a-z0-9]$`);
   }
 
   const isExisting = config.exists(GLOBAL_AW_DIR);
-  const silent = args['--silent'] === true;
   const cwd = process.cwd();
 
   // ── Fast path: already initialized → just pull + link ─────────────────

package/commands/nuke.mjs

@@ -14,7 +14,7 @@ const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
 const MANIFEST_PATH = join(GLOBAL_AW_DIR, '.aw-manifest.json');
 
 const IDE_DIRS = ['.claude', '.cursor', '.codex', '.agents'];
-const CONTENT_TYPES = ['agents', 'skills', 'commands', 'blueprints', 'evals'];
+const CONTENT_TYPES = ['agents', 'skills', 'commands', 'evals'];
 
 function loadManifest() {
   if (!existsSync(MANIFEST_PATH)) return null;

package/commands/pull.mjs

@@ -157,7 +157,7 @@ export function pullCommand(args) {
     // Apply
     const s2 = log.spinner();
     s2.start('Applying changes...');
-    const conflictCount = applyActions(actions);
+    const conflictCount = applyActions(actions, { teamNS: renameNamespace || undefined });
     updateManifest(workspaceDir, actions, cfg.namespace);
     s2.stop('Changes applied');
 
@@ -212,7 +212,7 @@ function printDryRun(actions, verbose) {
   const counts = { ADD: 0, UPDATE: 0, CONFLICT: 0, ORPHAN: 0, UNCHANGED: 0 };
   const lines = [];
 
-  for (const type of ['agents', 'skills', 'commands', 'blueprints', 'evals']) {
+  for (const type of ['agents', 'skills', 'commands', 'evals']) {
     const items = actions.filter(a => a.type === type);
     if (items.length === 0) continue;
 
@@ -236,7 +236,7 @@ function printDryRun(actions, verbose) {
 function printSummary(actions, verbose, conflictCount) {
   const conflicts = actions.filter(a => a.action === 'CONFLICT');
 
-  for (const type of ['agents', 'skills', 'commands', 'blueprints', 'evals']) {
+  for (const type of ['agents', 'skills', 'commands', 'evals']) {
     const typeActions = actions.filter(a => a.type === type);
     if (typeActions.length === 0) continue;
 

package/commands/push.mjs

@@ -64,15 +64,26 @@ export function pushCommand(args) {
   }
 
   // Parse registry path to get type, namespace, slug
+  // The path must contain agents/, skills/, or commands/ as a parent directory.
+  // Nesting before that doesn't matter (e.g. platform/services/agents/ is fine).
   const regParts = resolved.registryPath.split('/');
   let typeIdx = -1;
-  const validTypes = ['agents', 'skills', 'commands', 'blueprints', 'evals'];
-  for (let i = 0; i < regParts.length; i++) {
-    if (validTypes.includes(regParts[i])) { typeIdx = i; break; }
+  const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals'];
+  for (let i = regParts.length - 1; i >= 0; i--) {
+    if (PUSHABLE_TYPES.includes(regParts[i])) { typeIdx = i; break; }
   }
 
   if (typeIdx === -1 || typeIdx + 1 >= regParts.length) {
-    fmt.cancel(`Could not determine type from path: ${resolved.registryPath}`);
+    fmt.cancel([
+      `Invalid push path: ${chalk.red(resolved.registryPath)}`,
+      '',
+      `  Content must live under an ${chalk.bold('agents/')}, ${chalk.bold('skills/')}, ${chalk.bold('commands/')}, or ${chalk.bold('evals/')} directory.`,
+      '',
+      `  ${chalk.dim('Valid examples:')}`,
+      `    aw push .aw_registry/commerce/quality/agents/unit-tester.md`,
+      `    aw push .aw_registry/platform/services/skills/development`,
+      `    aw push .aw_registry/commerce/shared/commands/ship.md`,
+    ].join('\n'));
   }
 
   const namespaceParts = regParts.slice(0, typeIdx);

package/commands/search.mjs

@@ -94,7 +94,7 @@ function searchLocal(workspaceDir, query) {
     if (!nsEntry.isDirectory() || nsEntry.name.startsWith('.')) continue;
     const ns = nsEntry.name;
 
-    for (const type of ['agents', 'skills', 'commands', 'blueprints', 'evals']) {
+    for (const type of ['agents', 'skills', 'commands', 'evals']) {
       const typeDir = join(workspaceDir, ns, type);
       if (!existsSync(typeDir)) continue;
 

package/constants.mjs

@@ -1,7 +1,7 @@
 // constants.mjs — Single source of truth for registry settings.
 
 /** Base branch for PRs and sync checkout */
-export const REGISTRY_BASE_BRANCH = 'master';
+export const REGISTRY_BASE_BRANCH = 'chore/restructure';
 
 /** Default registry repository */
 export const REGISTRY_REPO = 'GoHighLevel/ghl-agentic-workspace';

package/git.mjs

@@ -48,7 +48,7 @@ export function cleanup(tempDir) {
 
 /**
  * Compute sparse checkout paths from include paths.
- * e.g., ["ghl", "dev/agents/debugger"] -> ["registry/ghl", "registry/dev/agents/debugger"]
+ * e.g., ["platform", "dev/agents/debugger"] -> ["registry/platform", "registry/dev/agents/debugger"]
  */
 export function includeToSparsePaths(paths) {
   const result = new Set();

package/glob.mjs

@@ -1,7 +1,7 @@
 // glob.mjs — Simple path matching. Zero dependencies.
 // No wildcards. Path prefix matching only.
-// "ghl" matches "ghl/agents/foo", "ghl/skills/bar", etc.
-// "ghl/agents/foo" matches exactly "ghl/agents/foo"
+// "platform" matches "platform/agents/foo", "platform/skills/bar", etc.
+// "platform/agents/foo" matches exactly "platform/agents/foo"
 // "dev/skills/my-skill/references" matches "dev/skills/my-skill" (parent match)
 
 /**

package/integrate.mjs

@@ -131,7 +131,7 @@ Team: ${team} | Local-first orchestration via \`.aw_docs/\` | MCPs: \`memory/*\`
 
 ## Routing Rule (ABSOLUTE)
 
-> **Every non-trivial task MUST call \`Skill(skill: "ghl-ai-task-router")\` BEFORE any response.**
+> **Every non-trivial task MUST call \`Skill(skill: "platform-ai-task-router")\` BEFORE any response.**
 >
 > **Trivial** (do directly): typo fixes, single-line edits, git ops, file exploration, factual code questions.
 >
@@ -143,17 +143,16 @@ Team: ${team} | Local-first orchestration via \`.aw_docs/\` | MCPs: \`memory/*\`
 
 \`\`\`
 .aw_registry/
-├── ghl/                    # Platform layer (shared, read-only)
+├── platform/               # Platform layer (shared, read-only)
 │   ├── agents/             # 15 platform agents (reviewers, engineers, designer)
 │   ├── skills/             # 77 platform skills (SKILL.md files)
-│   ├── commands/           # Platform commands (health-check, help, discover)
+│   ├── commands/           # Platform commands (grafana-health, help, discover)
 │   └── evals/              # Platform agent & skill quality tests
 │
 ├── ${team}/                    # Team layer (from template, customizable)
 │   ├── agents/             # Team agents (developers, testers, PM, coordinator)
 │   ├── skills/             # Team-specific skills
 │   ├── commands/           # Workflow commands (ship, plan, review, deploy, etc.)
-│   ├── blueprints/         # Development workflow blueprints
 │   └── evals/              # Team agent quality tests
 │
 └── .sync-config.json       # Tracks synced paths and team namespace
@@ -170,7 +169,7 @@ Team: ${team} | Local-first orchestration via \`.aw_docs/\` | MCPs: \`memory/*\`
 └── tasks/BOARD.md              # Task board
 \`\`\`
 
-Symlinked to \`.claude/{agents,skills,commands/aw,blueprints,evals}\`.
+Symlinked to \`.claude/{agents,skills,commands/aw,evals}\`.
 
 ## Local-First Operations
 
@@ -203,29 +202,29 @@ stitch/*       → External design generation
 
 ## Symlink Naming
 
-All symlinks are prefixed with their namespace (\`ghl-\` or \`${team}-\`):
-- \`.aw_registry/ghl/agents/security-reviewer.md\` → \`.claude/agents/ghl-security-reviewer.md\`
-- \`.aw_registry/${team}/agents/frontend-developer.md\` → \`.claude/agents/${team}-frontend-developer.md\`
+All symlinks are prefixed with their namespace (\`platform-\` or \`${team}-\`):
+- \`.aw_registry/platform/review/agents/security-reviewer.md\` → \`.claude/agents/platform-review-security-reviewer.md\`
+- \`.aw_registry/${team}/frontend/agents/frontend-developer.md\` → \`.claude/agents/${team}-frontend-developer.md\`
 - \`.aw_registry/${team}/commands/ship.md\` → \`.claude/commands/aw/${team}-ship.md\`
 
 ## Dependency Rule
 
-- **ghl/ is self-contained** — platform agents reference only platform skills
-- **${team}/ can reference ghl/** — team agents use \`ghl-*\` prefixed skill names
-- **ghl/ never references ${team}/** — platform layer knows nothing about team-specific resources
+- **platform/ is self-contained** — platform agents reference only platform skills
+- **${team}/ can reference platform/** — team agents use \`platform-*\` prefixed skill names
+- **platform/ never references ${team}/** — platform layer knows nothing about team-specific resources
 
 ## How Agents Connect to Skills
 
 Agents declare skills in frontmatter \`skills:\` list:
 \`\`\`yaml
-# ghl/agents/security-reviewer.md — platform skills directly
+# platform/review/agents/security-reviewer.md — platform skills directly
 skills:
-  - security-review
+  - platform-review-security-review
   - platform-services-authentication-authorization
 
-# ${team}/agents/frontend-developer.md — ghl- prefix for platform skills
+# ${team}/frontend/agents/frontend-developer.md — platform- prefix for platform skills
 skills:
-  - ghl-vue-development                      # → ghl/skills/vue-development
+  - platform-frontend-vue-development         # → platform/frontend/skills/vue-development
   - create-prd                                # → ${team}/skills/create-prd (local)
 \`\`\`
 
@@ -272,11 +271,11 @@ Two-layer agent system with local-first orchestration. Agents are loaded from \`
 Commands load agents entirely from local files — no MCP calls for agent/skill loading:
 
 \`\`\`
-1. Read .aw_registry/ghl/agents/<slug>.md       → Agent identity, skills[] list, capabilities
+1. Read .aw_registry/platform/agents/<slug>.md       → Agent identity, skills[] list, capabilities
    OR   .aw_registry/${team}/agents/<slug>.md
 
 2. For each skill in the agent's skills[] frontmatter:
-   Read .aw_registry/ghl/skills/<slug>/SKILL.md  → Full skill body (patterns, checklists)
+   Read .aw_registry/platform/skills/<slug>/SKILL.md  → Full skill body (patterns, checklists)
    OR   .aw_registry/${team}/skills/<slug>/SKILL.md
 
 3. Read .aw_docs/learnings/<slug>.md             → Prior learnings from past runs
@@ -284,72 +283,72 @@ Commands load agents entirely from local files — no MCP calls for agent/skill
 4. Call MCP memory/search({query: "..."})         → Recalled memories (only MCP call)
 \`\`\`
 
-### Platform Agents (ghl-)
+### Platform Agents (platform-)
 
-Shared infrastructure agents — always available, self-contained. Loaded from \`.aw_registry/ghl/agents/\`.
+Shared infrastructure agents — always available, self-contained. Loaded from \`.aw_registry/platform/agents/\`.
 
 | Agent | Role | Model Tier |
 |-------|------|------------|
-| \`ghl-architecture-reviewer\` | Architecture review, ADR compliance, coupling detection | Sonnet |
-| \`ghl-security-reviewer\` | Security review, auth patterns, tenant isolation | Sonnet |
-| \`ghl-performance-reviewer\` | Performance review, bundle analysis, N+1 detection | Sonnet |
-| \`ghl-frontend-engineer\` | MFA architecture, event-bus, shared packages | Sonnet |
-| \`ghl-services-engineer\` | Inter-service comms, workers, circuit breakers | Sonnet |
-| \`ghl-infra-engineer\` | Kubernetes, Terraform, Jenkins, deployment | Sonnet |
-| \`ghl-database-engineer\` | MongoDB, Redis, Elasticsearch, Firestore, migrations | Sonnet |
-| \`ghl-product-designer\` | HighRise design system, accessibility, typography | Sonnet |
-| \`ghl-frontend-core-reviewer\` | Vue 3 patterns, composables, Pinia stores | Sonnet |
-| \`ghl-frontend-i18n-reviewer\` | i18n compliance, translation keys | Haiku |
-| \`ghl-maintainability-reviewer\` | Code duplication, naming, complexity | Haiku |
-| \`ghl-reliability-reviewer\` | Error handling, null guards, SSR safety | Haiku |
-| \`ghl-sdet-engineer\` | Playwright POM, quality gates, performance testing | Haiku |
-| \`ghl-devops-automator\` | Docker, Jenkins pipelines, deployment strategies | Haiku |
-| \`ghl-data-engineer\` | CDC pipelines, ClickHouse, analytics data models | Haiku |
+| \`platform-review-architecture-reviewer\` | Architecture review, ADR compliance, coupling detection | Sonnet |
+| \`platform-review-security-reviewer\` | Security review, auth patterns, tenant isolation | Sonnet |
+| \`platform-review-performance-reviewer\` | Performance review, bundle analysis, N+1 detection | Sonnet |
+| \`platform-frontend-code-writer\` | MFA architecture, event-bus, shared packages | Sonnet |
+| \`platform-services-engineer\` | Inter-service comms, workers, circuit breakers | Sonnet |
+| \`platform-infra-engineer\` | Kubernetes, Terraform, Jenkins, deployment | Sonnet |
+| \`platform-data-db-engineer\` | MongoDB, Redis, Elasticsearch, Firestore, migrations | Sonnet |
+| \`platform-design-designer\` | HighRise design system, accessibility, typography | Sonnet |
+| \`platform-frontend-code-reviewer\` | Vue 3 patterns, composables, Pinia stores | Sonnet |
+| \`platform-frontend-i18n-reviewer\` | i18n compliance, translation keys | Haiku |
+| \`platform-review-maintainability-reviewer\` | Code duplication, naming, complexity | Haiku |
+| \`platform-review-reliability-reviewer\` | Error handling, null guards, SSR safety | Haiku |
+| \`platform-sdet-engineer\` | Playwright POM, quality gates, performance testing | Haiku |
+| \`platform-devops-automator\` | Docker, Jenkins pipelines, deployment strategies | Haiku |
+| \`platform-data-engineer\` | CDC pipelines, ClickHouse, analytics data models | Haiku |
 
 ### Team Agents (${team}-)
 
-Team-specific agents — customizable. Loaded from \`.aw_registry/${team}/agents/\`. Can reference platform skills via \`ghl-*\` prefix.
+Team-specific agents — customizable. Loaded from \`.aw_registry/${team}/agents/\`. Can reference platform skills via \`platform-*\` prefix.
 
 | Agent | Role | Model Tier |
 |-------|------|------------|
-| \`${team}-coordinator\` | Task decomposition, quality gate enforcement, orchestration | Opus |
-| \`${team}-architect\` | ADR creation, data flow design, system architecture | Opus |
+| \`${team}-shared-coordinator\` | Task decomposition, quality gate enforcement, orchestration | Opus |
+| \`${team}-shared-architect\` | ADR creation, data flow design, system architecture | Opus |
 | \`${team}-product-manager\` | PRDs, feature prioritization, sprint planning | Opus |
 | \`${team}-frontend-developer\` | Vue components, composables, TypeScript | Sonnet |
 | \`${team}-backend-developer\` | NestJS services, API endpoints, workers | Sonnet |
-| \`${team}-manager\` | Spec writing, user stories, team coordination | Sonnet |
-| \`${team}-unit-tester\` | Component tests, composable tests, BDD | Haiku |
-| \`${team}-e2e-tester\` | Cypress tests, Gherkin scenarios | Haiku |
-| \`${team}-mutation-tester\` | Stryker mutation analysis, test improvement | Haiku |
-| \`${team}-release-engineer\` | Release checklists, rollback plans, deploy | Sonnet |
+| \`${team}-product-owner\` | Spec writing, user stories, team coordination | Sonnet |
+| \`${team}-quality-unit-tester\` | Component tests, composable tests, BDD | Haiku |
+| \`${team}-quality-e2e-tester\` | Cypress tests, Gherkin scenarios | Haiku |
+| \`${team}-quality-mutation-tester\` | Stryker mutation analysis, test improvement | Haiku |
+| \`${team}-infra-release-engineer\` | Release checklists, rollback plans, deploy | Sonnet |
 | \`${team}-design-reviewer\` | Design token audit, accessibility review | Haiku |
 | \`${team}-design-auditor\` | Dark mode audit, design token verification | Haiku |
-| \`${team}-technical-writer\` | API docs, migration guides | Haiku |
-| \`${team}-api-tester\` | API contract tests, auth flow tests | Haiku |
-| \`${team}-visual-tester\` | Screenshot comparison, visual test plans | Haiku |
-| \`${team}-responsive-tester\` | Breakpoint audit, touch target compliance | Haiku |
-| \`${team}-performance-benchmarker\` | Core Web Vitals, k6 scripts | Haiku |
-| \`${team}-stitch-designer\` | Multi-screen flows, screen prompts | Haiku |
-| \`${team}-animation-specialist\` | Transitions, reduced motion compliance | Haiku |
-| \`${team}-ux-researcher\` | Interview scripts, usability test plans | Haiku |
-| \`${team}-onboarding-optimizer\` | Empty state design, onboarding flow critique | Haiku |
+| \`${team}-shared-technical-writer\` | API docs, migration guides | Haiku |
+| \`${team}-quality-api-tester\` | API contract tests, auth flow tests | Haiku |
+| \`${team}-quality-visual-tester\` | Screenshot comparison, visual test plans | Haiku |
+| \`${team}-quality-responsive-tester\` | Breakpoint audit, touch target compliance | Haiku |
+| \`${team}-quality-performance-benchmarker\` | Core Web Vitals, k6 scripts | Haiku |
+| \`${team}-design-stitch\` | Multi-screen flows, screen prompts | Haiku |
+| \`${team}-design-animation-specialist\` | Transitions, reduced motion compliance | Haiku |
+| \`${team}-design-ux-researcher\` | Interview scripts, usability test plans | Haiku |
+| \`${team}-product-onboarding-optimizer\` | Empty state design, onboarding flow critique | Haiku |
 
 ### Skill Resolution
 
 Agents declare skills in their frontmatter \`skills:\` list. Commands read SKILL.md files directly from disk:
 
 - **No prefix** → \`.aw_registry/${team}/skills/<name>/SKILL.md\`
-- **\`ghl-\` prefix** → \`.aw_registry/ghl/skills/<name-without-ghl->/SKILL.md\`
+- **\`platform-\` prefix** → \`.aw_registry/platform/skills/<name-without-platform->/SKILL.md\`
 
 \`\`\`yaml
-# .aw_registry/ghl/agents/security-reviewer.md — platform skills directly
+# .aw_registry/platform/agents/security-reviewer.md — platform skills directly
 skills:
-  - security-review                                    # → .aw_registry/ghl/skills/security-review/SKILL.md
-  - platform-services-authentication-authorization     # → .aw_registry/ghl/skills/platform-services-.../SKILL.md
+  - platform-review-security-review                    # → .aw_registry/platform/review/skills/security-review/SKILL.md
+  - platform-services-authentication-authorization     # → .aw_registry/platform/services/skills/authentication-authorization/SKILL.md
 
-# .aw_registry/${team}/agents/frontend-developer.md — ghl- prefix for platform skills
+# .aw_registry/${team}/frontend/agents/frontend-developer.md — platform- prefix for platform skills
 skills:
-  - ghl-vue-development                                # → .aw_registry/ghl/skills/vue-development/SKILL.md
+  - platform-frontend-vue-development                   # → .aw_registry/platform/frontend/skills/vue-development/SKILL.md
   - create-prd                                         # → .aw_registry/${team}/skills/create-prd/SKILL.md
 \`\`\`
 
@@ -364,8 +363,8 @@ skills:
 /aw:${team}-brainstorm        # Requirement exploration with architect + PM
 
 # Via Agent tool (direct invocation — no run tracking)
-Agent(subagent_type: "ghl:security-reviewer", prompt: "Review this PR for security issues")
-Agent(subagent_type: "${team}:frontend-developer", prompt: "Create a Vue component for...")
+Agent(subagent_type: "platform-review:security-reviewer", prompt: "Review this PR for security issues")
+Agent(subagent_type: "${team}-frontend:developer", prompt: "Create a Vue component for...")
 \`\`\`
 
 ### Learnings & Knowledge
@@ -374,8 +373,8 @@ Agent knowledge accumulates across runs via \`.aw_docs/learnings/\`:
 
 \`\`\`
 .aw_docs/learnings/
-├── backend-developer.md        # Learnings from all runs where this agent worked
-├── frontend-developer.md       # Appended after each workflow close
+├── backend-developer.md # Learnings from all runs where this agent worked
+├── frontend-developer.md  # Appended after each workflow close
 ├── architecture-reviewer.md    # Prior learnings loaded before each run
 └── _pending-sync.jsonl         # Queue for eager sync to MCP memory/store
 \`\`\`
@@ -386,12 +385,12 @@ Before each run, prior learnings are read from these files and injected into age
 
 Each agent has quality test cases in \`.claude/evals/\`:
 \`\`\`
-.claude/evals/ghl-agents-security-reviewer/     # Platform agent evals
-.claude/evals/${team}-agents-frontend-developer/  # Team agent evals
-.claude/evals/ghl-skills-vue-development/        # Skill evals
+.claude/evals/platform-agents-security-reviewer/     # Platform agent evals
+.claude/evals/${team}-frontend-agents-frontend-developer/  # Team agent evals
+.claude/evals/platform-frontend-skills-vue-development/  # Skill evals
 \`\`\`
 
-Run with: \`/ghl:eval agent:<slug>\` or \`/ghl:eval skill:<slug>\`
+Run with: \`/platform:eval agent:<slug>\` or \`/platform:eval skill:<slug>\`
 `;
 }
 

package/link.mjs

@@ -7,7 +7,8 @@ import * as fmt from './fmt.mjs';
 
 const IDE_DIRS = ['.claude', '.cursor', '.codex'];
 // Per-file symlink types
-const FILE_TYPES = ['agents', 'blueprints'];
+const FILE_TYPES = ['agents'];
+const ALL_KNOWN_TYPES = new Set([...FILE_TYPES, 'skills', 'commands', 'evals']);
 
 /**
  * List namespace directories inside .aw_registry/ (skip dotfiles).
@@ -29,40 +30,61 @@ function listDirs(dir) {
     .map(d => d.name);
 }
 
+/**
+ * Recursively find directories named `typeName` within `nsDir`,
+ * skipping other known type directories to avoid false matches.
+ * Returns [{typeDirPath, segments}] where segments are the intermediate
+ * directory names between nsDir and the type dir.
+ *
+ * Example: nsDir=.aw_registry/platform, typeName='agents'
+ *   platform/agents/          → { typeDirPath: '.../agents', segments: [] }
+ *   platform/frontend/agents/ → { typeDirPath: '.../frontend/agents', segments: ['frontend'] }
+ */
+function findNestedTypeDirs(nsDir, typeName) {
+  const results = [];
+  function walk(dir, segments) {
+    if (!existsSync(dir)) return;
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      if (!entry.isDirectory() || entry.name.startsWith('.')) continue;
+      if (entry.name === typeName) {
+        results.push({ typeDirPath: join(dir, entry.name), segments });
+      } else if (!ALL_KNOWN_TYPES.has(entry.name)) {
+        walk(join(dir, entry.name), [...segments, entry.name]);
+      }
+    }
+  }
+  walk(nsDir, []);
+  return results;
+}
+
 /**
  * Clean all symlinks from IDE type directories before re-linking.
  */
 function cleanIdeSymlinks(cwd) {
   for (const ide of IDE_DIRS) {
-    for (const type of [...FILE_TYPES, 'skills', 'evals']) {
-      const dir = join(cwd, ide, type);
-      if (!existsSync(dir)) continue;
-      for (const entry of readdirSync(dir)) {
-        const p = join(dir, entry);
-        try {
-          if (lstatSync(p).isSymbolicLink()) unlinkSync(p);
-        } catch { /* best effort */ }
-      }
-    }
-    // Clean command symlinks (both flat legacy and namespaced aw/)
-    const cmdDir = join(cwd, ide, 'commands');
-    if (!existsSync(cmdDir)) continue;
-    for (const entry of readdirSync(cmdDir)) {
-      const p = join(cmdDir, entry);
-      try {
-        if (lstatSync(p).isSymbolicLink()) unlinkSync(p);
-      } catch { /* best effort */ }
-    }
-    // Clean inside commands/aw/ namespace dir
-    const awCmdDir = join(cmdDir, 'aw');
-    if (existsSync(awCmdDir)) {
-      for (const entry of readdirSync(awCmdDir)) {
-        const p = join(awCmdDir, entry);
-        try {
-          if (lstatSync(p).isSymbolicLink()) unlinkSync(p);
-        } catch { /* best effort */ }
+    const ideDir = join(cwd, ide);
+    if (!existsSync(ideDir)) continue;
+    cleanSymlinksRecursive(ideDir);
+  }
+  // Also clean .agents/skills/
+  const agentsSkillsDir = join(cwd, '.agents', 'skills');
+  if (existsSync(agentsSkillsDir)) cleanSymlinksRecursive(agentsSkillsDir);
+}
+
+/**
+ * Remove all symlinks in a directory (non-recursive into subdirs,
+ * but does walk immediate child directories one level deep).
+ */
+function cleanSymlinksRecursive(dir) {
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    const p = join(dir, entry.name);
+    try {
+      if (lstatSync(p).isSymbolicLink()) {
+        unlinkSync(p);
+      } else if (entry.isDirectory()) {
+        cleanSymlinksRecursive(p);
       }
-    }
+    } catch { /* best effort */ }
   }
 }
 
@@ -76,10 +98,14 @@ function flatName(ns, name) {
 /**
  * Create/refresh all IDE symlinks.
  *
- * - agents, blueprints: per-file symlinks with flat names
+ * - agents: per-file symlinks with flat names
  * - skills: per-skill directory symlinks with flat names
  * - commands: directory symlink per namespace → .claude/commands/<ns>/
  *   (Claude Code needs a directory at .claude/commands/<ns>/ for /<ns>:* autocomplete)
+ *
+ * Note: [template] namespace is renamed to the team name by `aw init`
+ * (via pullCommand with _renameNamespace) before linking. $TEAM_NS in
+ * file content is resolved by LLMs at runtime using AW-PROTOCOL.md context.
  */
 export function linkWorkspace(cwd) {
   const awDir = join(cwd, '.aw_registry');
@@ -93,19 +119,37 @@ export function linkWorkspace(cwd) {
   const namespaces = listNamespaceDirs(awDir);
 
   for (const ns of namespaces) {
-    // Per-file types: agents, blueprints
+    // Per-file types: agents (recursive for nested domain dirs)
     for (const type of FILE_TYPES) {
-      const typeDir = join(awDir, ns, type);
-      if (!existsSync(typeDir)) continue;
+      for (const { typeDirPath, segments } of findNestedTypeDirs(join(awDir, ns), type)) {
+        for (const file of readdirSync(typeDirPath).filter(f => f.endsWith('.md') && !f.startsWith('.'))) {
+          const flat = [ns, ...segments, file].join('-');
+
+          for (const ide of IDE_DIRS) {
+            const linkDir = join(cwd, ide, type);
+            mkdirSync(linkDir, { recursive: true });
+            const linkPath = join(linkDir, flat);
+            const targetPath = join(typeDirPath, file);
+            const relTarget = relative(linkDir, targetPath);
+            try {
+              execSync(`ln -sfn "${relTarget}" "${linkPath}"`, { stdio: 'pipe' });
+              created++;
+            } catch { /* best effort */ }
+          }
+        }
+      }
+    }
 
-      for (const file of readdirSync(typeDir).filter(f => f.endsWith('.md') && !f.startsWith('.'))) {
-        const flat = flatName(ns, file);
+    // Skills: per-skill directory symlinks (recursive for nested domain dirs)
+    for (const { typeDirPath: skillsDir, segments } of findNestedTypeDirs(join(awDir, ns), 'skills')) {
+      for (const skill of listDirs(skillsDir)) {
+        const flat = [ns, ...segments, skill].join('-');
 
         for (const ide of IDE_DIRS) {
-          const linkDir = join(cwd, ide, type);
+          const linkDir = join(cwd, ide, 'skills');
           mkdirSync(linkDir, { recursive: true });
           const linkPath = join(linkDir, flat);
-          const targetPath = join(awDir, ns, type, file);
+          const targetPath = join(skillsDir, skill);
           const relTarget = relative(linkDir, targetPath);
           try {
             execSync(`ln -sfn "${relTarget}" "${linkPath}"`, { stdio: 'pipe' });
@@ -114,19 +158,42 @@ export function linkWorkspace(cwd) {
         }
       }
     }
+  }
 
-    // Skills: per-skill directory symlinks
-    const skillsDir = join(awDir, ns, 'skills');
-    if (!existsSync(skillsDir)) continue;
-    for (const skill of listDirs(skillsDir)) {
-      const flat = flatName(ns, skill);
+  // Evals: per-eval-dir symlinks (recursive for nested domain dirs)
+  for (const ns of namespaces) {
+    for (const { typeDirPath: evalsDir, segments } of findNestedTypeDirs(join(awDir, ns), 'evals')) {
+      for (const subType of listDirs(evalsDir)) {
+        const subDir = join(evalsDir, subType);
+        for (const evalName of listDirs(subDir)) {
+          const flat = [ns, ...segments, subType, evalName].join('-');
+
+          for (const ide of IDE_DIRS) {
+            const linkDir = join(cwd, ide, 'evals');
+            mkdirSync(linkDir, { recursive: true });
+            const linkPath = join(linkDir, flat);
+            const targetPath = join(subDir, evalName);
+            const relTarget = relative(linkDir, targetPath);
+            try {
+              execSync(`ln -sfn "${relTarget}" "${linkPath}"`, { stdio: 'pipe' });
+              created++;
+            } catch { /* best effort */ }
+          }
+        }
+      }
+    }
+  }
 
-      for (const ide of IDE_DIRS) {
-        const linkDir = join(cwd, ide, 'skills');
-        mkdirSync(linkDir, { recursive: true });
-        const linkPath = join(linkDir, flat);
+  // Codex per-skill symlinks: .agents/skills/<name>
+  const agentsSkillsDir = join(cwd, '.agents/skills');
+  for (const ns of namespaces) {
+    for (const { typeDirPath: skillsDir, segments } of findNestedTypeDirs(join(awDir, ns), 'skills')) {
+      mkdirSync(agentsSkillsDir, { recursive: true });
+      for (const skill of listDirs(skillsDir)) {
+        const flat = [ns, ...segments, skill].join('-');
+        const linkPath = join(agentsSkillsDir, flat);
         const targetPath = join(skillsDir, skill);
-        const relTarget = relative(linkDir, targetPath);
+        const relTarget = relative(agentsSkillsDir, targetPath);
         try {
           execSync(`ln -sfn "${relTarget}" "${linkPath}"`, { stdio: 'pipe' });
           created++;
@@ -135,21 +202,17 @@ export function linkWorkspace(cwd) {
     }
   }
 
-  // Evals: per-eval-dir symlinks (evals/agents/<name>/, evals/skills/<name>/)
+  // Commands: per-file symlinks (recursive for nested domain dirs)
   for (const ns of namespaces) {
-    const evalsDir = join(awDir, ns, 'evals');
-    if (!existsSync(evalsDir)) continue;
-
-    for (const subType of listDirs(evalsDir)) {
-      const subDir = join(evalsDir, subType);
-      for (const evalName of listDirs(subDir)) {
-        const flat = `${ns}-${subType}-${evalName}`;
+    for (const { typeDirPath: commandsDir, segments } of findNestedTypeDirs(join(awDir, ns), 'commands')) {
+      for (const file of readdirSync(commandsDir).filter(f => f.endsWith('.md') && !f.startsWith('.'))) {
+        const cmdFileName = [ns, ...segments, file].join('-');
 
         for (const ide of IDE_DIRS) {
-          const linkDir = join(cwd, ide, 'evals');
+          const linkDir = join(cwd, ide, 'commands', 'aw');
           mkdirSync(linkDir, { recursive: true });
-          const linkPath = join(linkDir, flat);
-          const targetPath = join(subDir, evalName);
+          const linkPath = join(linkDir, cmdFileName);
+          const targetPath = join(commandsDir, file);
           const relTarget = relative(linkDir, targetPath);
           try {
             execSync(`ln -sfn "${relTarget}" "${linkPath}"`, { stdio: 'pipe' });
@@ -160,47 +223,6 @@ export function linkWorkspace(cwd) {
     }
   }
 
-  // Codex per-skill symlinks: .agents/skills/<name>
-  const agentsSkillsDir = join(cwd, '.agents/skills');
-  for (const ns of namespaces) {
-    const skillsDir = join(awDir, ns, 'skills');
-    if (!existsSync(skillsDir)) continue;
-    mkdirSync(agentsSkillsDir, { recursive: true });
-    for (const skill of listDirs(skillsDir)) {
-      const flat = flatName(ns, skill);
-      const linkPath = join(agentsSkillsDir, flat);
-      const targetPath = join(skillsDir, skill);
-      const relTarget = relative(agentsSkillsDir, targetPath);
-      try {
-        execSync(`ln -sfn "${relTarget}" "${linkPath}"`, { stdio: 'pipe' });
-        created++;
-      } catch { /* best effort */ }
-    }
-  }
-
-  // Commands: per-file symlinks from <ns>/commands/ → .claude/commands/aw/
-  // All commands (hand-written + generated) live in namespace/commands/ as single source of truth
-  for (const ns of namespaces) {
-    const commandsDir = join(awDir, ns, 'commands');
-    if (!existsSync(commandsDir)) continue;
-
-    for (const file of readdirSync(commandsDir).filter(f => f.endsWith('.md') && !f.startsWith('.'))) {
-      const cmdFileName = `${ns}-${file}`;
-
-      for (const ide of IDE_DIRS) {
-        const linkDir = join(cwd, ide, 'commands', 'aw');
-        mkdirSync(linkDir, { recursive: true });
-        const linkPath = join(linkDir, cmdFileName);
-        const targetPath = join(commandsDir, file);
-        const relTarget = relative(linkDir, targetPath);
-        try {
-          execSync(`ln -sfn "${relTarget}" "${linkPath}"`, { stdio: 'pipe' });
-          created++;
-        } catch { /* best effort */ }
-      }
-    }
-  }
-
   // AW-PROTOCOL.md: symlink into each IDE dir root so commands can always find it
   const protocolSrc = join(awDir, 'AW-PROTOCOL.md');
   if (existsSync(protocolSrc)) {

package/package.json

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

package/paths.mjs

@@ -3,7 +3,7 @@
 import { existsSync, statSync, lstatSync, readlinkSync } from 'node:fs';
 import { join, resolve, relative, basename, dirname } from 'node:path';
 
-const VALID_TYPES = new Set(['agents', 'skills', 'commands', 'blueprints', 'evals']);
+const VALID_TYPES = new Set(['agents', 'skills', 'commands', 'evals']);
 
 // IDE dirs that may contain symlinks into .aw_registry/
 const IDE_PREFIXES = ['.claude/', '.cursor/', '.codex/', '.agents/'];
@@ -11,8 +11,8 @@ const IDE_PREFIXES = ['.claude/', '.cursor/', '.codex/', '.agents/'];
 /**
  * Convert a local workspace path to a registry path.
  *
- * .aw_registry/ghl/agents/architecture-reviewer.md
- *   → ghl/agents/architecture-reviewer
+ * .aw_registry/platform/agents/architecture-reviewer.md
+ *   → platform/agents/architecture-reviewer
  *
  * .aw_registry/dev-nitro/skills/my-skill/SKILL.md
  *   → dev-nitro/skills/my-skill/SKILL
@@ -34,8 +34,8 @@ export function localToRegistry(localPath) {
 /**
  * Convert a registry path to a local workspace path.
  *
- * ghl/agents/architecture-reviewer
- *   → ghl/agents/architecture-reviewer.md
+ * platform/agents/architecture-reviewer
+ *   → platform/agents/architecture-reviewer.md
  *
  * dev-nitro/skills/my-skill/SKILL
  *   → dev-nitro/skills/my-skill/SKILL.md

package/plan.mjs

@@ -102,7 +102,7 @@ export function computePlan(registryDirs, workspaceDir, includePatterns = [], {
       // Find the type segment
       let typeIdx = -1;
       for (let i = 0; i < parts.length; i++) {
-        if (['agents', 'skills', 'commands', 'blueprints', 'evals'].includes(parts[i])) {
+        if (['agents', 'skills', 'commands', 'evals'].includes(parts[i])) {
           typeIdx = i;
           break;
         }

package/registry.mjs

@@ -4,7 +4,7 @@ import { readFileSync, existsSync, readdirSync, statSync } from 'node:fs';
 import { join, relative } from 'node:path';
 import { createHash } from 'node:crypto';
 
-const TYPE_DIRS = new Set(['agents', 'skills', 'commands', 'blueprints', 'evals']);
+const TYPE_DIRS = new Set(['agents', 'skills', 'commands', 'evals']);
 
 export function sha256(content) {
   return createHash('sha256').update(content).digest('hex');
@@ -83,7 +83,7 @@ export function walkRegistryTree(baseDir, baseName) {
             });
           }
         } else {
-          // Agents, commands, blueprints — flat files
+          // Agents, commands — flat files
           for (const fileEntry of readdirSync(fullPath)) {
             if (fileEntry === '.gitkeep' || fileEntry.startsWith('.')) continue;
             const filePath = join(fullPath, fileEntry);