aiwg 2026.1.4 → 2026.1.5

package/docs/contributing/ci-cd-secrets.md

@@ -0,0 +1,188 @@
+# CI/CD Secrets Configuration
+
+**Version:** 1.0
+**Last Updated:** 2026-01-14
+**Target Audience:** Repository maintainers and administrators
+
+## Overview
+
+This document describes the secrets required for CI/CD workflows in the AIWG repository. Secrets are used for authentication with package registries and external services.
+
+## Required Secrets
+
+### NPM_TOKEN
+
+**Purpose:** Authenticate with Gitea's npm package registry for publishing.
+
+**Required Scopes:**
+- `package:write` - Required to publish packages
+- `package:read` - Required to verify published packages
+
+**Used In:**
+- `.gitea/workflows/npm-publish.yml` - Publishing to Gitea npm registry
+- Creating Gitea releases via API
+
+### Setting Up NPM_TOKEN
+
+#### Step 1: Create a Gitea Access Token
+
+1. Log in to [git.integrolabs.net](https://git.integrolabs.net)
+2. Navigate to **Settings** → **Applications** → **Access Tokens**
+   - Direct URL: https://git.integrolabs.net/user/settings/applications
+3. Create a new token with:
+   - **Token Name:** `ci-npm-publish` (or descriptive name)
+   - **Select Scopes:**
+     - ✅ `write:package` (includes read:package)
+     - ✅ `read:repository` (for checkout operations)
+   - **Expiration:** Set according to your security policy (recommend 1 year max)
+4. Click **Generate Token**
+5. **IMPORTANT:** Copy the token immediately - it won't be shown again
+
+#### Step 2: Add Secret to Gitea Repository
+
+1. Navigate to the repository: https://git.integrolabs.net/roctinam/ai-writing-guide
+2. Go to **Settings** → **Actions** → **Secrets**
+3. Click **Add Secret**
+4. Configure:
+   - **Name:** `NPM_TOKEN`
+   - **Value:** Paste the token from Step 1
+5. Click **Add Secret**
+
+#### Step 3: Verify Configuration
+
+Trigger a manual workflow run to verify:
+
+```bash
+# Push a test tag (can be deleted after)
+git tag v9999.99.99-test
+git push origin v9999.99.99-test
+
+# Watch the workflow at:
+# https://git.integrolabs.net/roctinam/ai-writing-guide/actions
+
+# Clean up test tag
+git tag -d v9999.99.99-test
+git push origin :refs/tags/v9999.99.99-test
+```
+
+Or use the workflow dispatch with dry_run enabled.
+
+## Troubleshooting
+
+### Error: 401 Unauthorized
+
+```
+npm error code E401
+npm error 401 Unauthorized - PUT https://git.integrolabs.net/api/packages/roctinam/npm/aiwg
+```
+
+**Causes:**
+1. **Token expired** - Create a new token and update the secret
+2. **Token missing** - Verify NPM_TOKEN secret exists in repository settings
+3. **Wrong scopes** - Token must have `write:package` scope
+4. **Token revoked** - Check if token still exists in user settings
+
+**Resolution:**
+1. Go to https://git.integrolabs.net/user/settings/applications
+2. Check if the token exists and hasn't expired
+3. If expired/missing, create a new token with `write:package` scope
+4. Update the repository secret with the new token
+
+### Error: 403 Forbidden
+
+**Causes:**
+1. Token belongs to user without package write permissions
+2. Repository doesn't allow package publishing
+
+**Resolution:**
+1. Ensure token owner has write access to the repository
+2. Check organization/repository package settings
+
+### Token Not Being Used
+
+If the workflow isn't picking up the secret:
+
+1. Verify secret name is exactly `NPM_TOKEN` (case-sensitive)
+2. Check workflow file references `${{ secrets.NPM_TOKEN }}`
+3. Ensure workflow has appropriate permissions in `permissions:` block
+
+## Security Best Practices
+
+### Token Management
+
+- **Rotation:** Rotate tokens annually or when team members leave
+- **Scope:** Use minimum required scopes (write:package, read:repository)
+- **Naming:** Use descriptive names like `ci-npm-publish-2026`
+- **Audit:** Periodically review active tokens
+
+### Secret Storage
+
+- Never commit tokens to the repository
+- Use repository/organization secrets, not environment variables in code
+- Don't echo or log token values in workflows
+
+### Workflow Security
+
+```yaml
+# Good: Token passed via secrets
+env:
+  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+# Bad: Token hardcoded or echoed
+run: echo ${{ secrets.NPM_TOKEN }}  # NEVER do this
+```
+
+## Workflow Architecture
+
+### npm-publish.yml Flow
+
+```
+[Tag Push v*] → [Checkout] → [Configure npm] → [Build] → [Publish to Gitea] → [Verify]
+                                   ↓
+                            Uses NPM_TOKEN for:
+                            - .npmrc authentication
+                            - npm publish command
+                            - Gitea release API
+```
+
+### Secret Usage in Workflow
+
+```yaml
+# .npmrc configuration (line 55-56)
+//git.integrolabs.net/api/packages/roctinam/npm/:_authToken=${{ secrets.NPM_TOKEN }}
+
+# Publish command (line 107-109)
+npm publish --registry=${{ env.GITEA_NPM_REGISTRY }}
+env:
+  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+# Release creation (line 137)
+-H "Authorization: token ${{ secrets.NPM_TOKEN }}"
+```
+
+## Additional Secrets (Optional)
+
+### NPMJS_TOKEN (for public npm)
+
+If publishing to public npmjs.org:
+
+1. Create token at https://www.npmjs.com/settings/tokens
+2. Select "Automation" token type
+3. Add as secret named `NPMJS_TOKEN`
+4. Update workflow to use separate token for public registry
+
+### GITHUB_TOKEN (for GitHub mirror)
+
+For GitHub Actions (`.github/workflows/`):
+
+- Automatically provided by GitHub Actions
+- No manual configuration needed
+- Used for GitHub Releases and npm publish to GitHub Packages
+
+## References
+
+- [Gitea Package Registry Documentation](https://docs.gitea.com/usage/packages/npm)
+- [Gitea Actions Secrets](https://docs.gitea.com/usage/actions/secrets)
+- [npm Authentication](https://docs.npmjs.com/using-private-packages-in-a-ci-cd-workflow)
+- @.gitea/workflows/npm-publish.yml - Main publish workflow
+- @.claude/rules/token-security.md - Token security rules

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiwg",
-  "version": "2026.01.4",
+  "version": "2026.01.5",
   "description": "Modular agentic framework for AI-powered SDLC, marketing automation, and workflow orchestration",
   "type": "module",
   "bin": {

package/tools/agents/providers/base.mjs

@@ -568,6 +568,136 @@ export function filterAgentFiles(files, opts) {
   });
 }
 
+// ============================================================================
+// Addon Discovery
+// ============================================================================
+
+/**
+ * Discover all addons in the agentic/code/addons directory
+ * @param {string} srcRoot - Source root directory
+ * @returns {Array<{name: string, path: string, manifest: object}>} - Array of addon info
+ */
+export function discoverAddons(srcRoot) {
+  const addonsDir = path.join(srcRoot, 'agentic', 'code', 'addons');
+  if (!fs.existsSync(addonsDir)) return [];
+
+  const addons = [];
+  for (const entry of fs.readdirSync(addonsDir, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+
+    const addonPath = path.join(addonsDir, entry.name);
+    const manifestPath = path.join(addonPath, 'manifest.json');
+
+    let manifest = {};
+    if (fs.existsSync(manifestPath)) {
+      try {
+        manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+      } catch (e) {
+        console.warn(`Warning: Could not parse manifest for addon ${entry.name}: ${e.message}`);
+      }
+    }
+
+    addons.push({
+      name: entry.name,
+      path: addonPath,
+      manifest
+    });
+  }
+
+  return addons;
+}
+
+/**
+ * Get all agent files from all addons
+ * @param {string} srcRoot - Source root directory
+ * @param {string[]} excludeAddons - Addon names to exclude (default: none)
+ * @returns {string[]} - Array of agent file paths
+ */
+export function getAddonAgentFiles(srcRoot, excludeAddons = []) {
+  const addons = discoverAddons(srcRoot);
+  const files = [];
+
+  for (const addon of addons) {
+    if (excludeAddons.includes(addon.name)) continue;
+
+    const agentsDir = path.join(addon.path, 'agents');
+    if (fs.existsSync(agentsDir)) {
+      files.push(...listMdFiles(agentsDir));
+    }
+  }
+
+  return files;
+}
+
+/**
+ * Get all command files from all addons
+ * @param {string} srcRoot - Source root directory
+ * @param {string[]} excludeAddons - Addon names to exclude (default: none)
+ * @returns {string[]} - Array of command file paths
+ */
+export function getAddonCommandFiles(srcRoot, excludeAddons = []) {
+  const addons = discoverAddons(srcRoot);
+  const files = [];
+
+  for (const addon of addons) {
+    if (excludeAddons.includes(addon.name)) continue;
+
+    const commandsDir = path.join(addon.path, 'commands');
+    if (fs.existsSync(commandsDir)) {
+      files.push(...listMdFiles(commandsDir));
+    }
+  }
+
+  return files;
+}
+
+/**
+ * Get all skill directories from all addons
+ * @param {string} srcRoot - Source root directory
+ * @param {string[]} excludeAddons - Addon names to exclude (default: none)
+ * @returns {string[]} - Array of skill directory paths
+ */
+export function getAddonSkillDirs(srcRoot, excludeAddons = []) {
+  const addons = discoverAddons(srcRoot);
+  const dirs = [];
+
+  for (const addon of addons) {
+    if (excludeAddons.includes(addon.name)) continue;
+
+    const skillsDir = path.join(addon.path, 'skills');
+    if (fs.existsSync(skillsDir)) {
+      dirs.push(...listSkillDirs(skillsDir));
+    }
+  }
+
+  return dirs;
+}
+
+/**
+ * Get addon files by category (agents, commands, skills)
+ * @param {string} srcRoot - Source root directory
+ * @param {object} options - Options
+ * @param {string[]} options.excludeAddons - Addon names to exclude
+ * @param {boolean} options.includeAgents - Include agent files (default: true)
+ * @param {boolean} options.includeCommands - Include command files (default: true)
+ * @param {boolean} options.includeSkills - Include skill directories (default: true)
+ * @returns {{agents: string[], commands: string[], skills: string[]}}
+ */
+export function getAddonFiles(srcRoot, options = {}) {
+  const {
+    excludeAddons = [],
+    includeAgents = true,
+    includeCommands = true,
+    includeSkills = true
+  } = options;
+
+  return {
+    agents: includeAgents ? getAddonAgentFiles(srcRoot, excludeAddons) : [],
+    commands: includeCommands ? getAddonCommandFiles(srcRoot, excludeAddons) : [],
+    skills: includeSkills ? getAddonSkillDirs(srcRoot, excludeAddons) : []
+  };
+}
+
 // ============================================================================
 // Provider Interface
 // ============================================================================

package/tools/agents/providers/claude.mjs

@@ -23,7 +23,10 @@ import {
   deploySkillDir,
   parseFrontmatter,
   initializeFrameworkWorkspace,
-  filterAgentFiles
+  filterAgentFiles,
+  getAddonAgentFiles,
+  getAddonCommandFiles,
+  getAddonSkillDirs
 } from './base.mjs';
 
 // ============================================================================
@@ -281,19 +284,16 @@ export async function deploy(opts) {
     }
   }
 
-  // Writing/general agents
-  if (mode === 'general' || mode === 'writing' || mode === 'both' || mode === 'all') {
-    const writingAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'agents');
-    agentFiles.push(...listMdFiles(writingAgentsDir));
+  // All addons (dynamically discovered)
+  if (mode === 'general' || mode === 'writing' || mode === 'sdlc' || mode === 'both' || mode === 'all') {
+    agentFiles.push(...getAddonAgentFiles(srcRoot));
 
     if (shouldDeployCommands || commandsOnly) {
-      const writingCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'commands');
-      commandFiles.push(...listMdFiles(writingCommandsDir));
+      commandFiles.push(...getAddonCommandFiles(srcRoot));
     }
 
     if (shouldDeploySkills || skillsOnly) {
-      const writingSkillsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'skills');
-      skillDirs.push(...listSkillDirs(writingSkillsDir));
+      skillDirs.push(...getAddonSkillDirs(srcRoot));
     }
   }
 
@@ -329,28 +329,6 @@ export async function deploy(opts) {
     }
   }
 
-  // Utils addon (always deployed with sdlc or all)
-  if (mode === 'sdlc' || mode === 'all') {
-    const utilsAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'agents');
-    agentFiles.push(...listMdFiles(utilsAgentsDir));
-
-    if (shouldDeployCommands || commandsOnly) {
-      const utilsCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'commands');
-      commandFiles.push(...listMdFiles(utilsCommandsDir));
-    }
-
-    if (shouldDeploySkills || skillsOnly) {
-      const utilsSkillsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'skills');
-      skillDirs.push(...listSkillDirs(utilsSkillsDir));
-    }
-  }
-
-  // Voice framework skills (always deployed)
-  if (shouldDeploySkills || skillsOnly) {
-    const voiceSkillsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'voice-framework', 'skills');
-    skillDirs.push(...listSkillDirs(voiceSkillsDir));
-  }
-
   // Deploy based on flags
   if (!commandsOnly && !skillsOnly) {
     // Apply filters if specified

package/tools/agents/providers/codex.mjs

@@ -26,7 +26,10 @@ import {
   writeFile,
   deployFiles,
   createAgentsMdFromTemplate,
-  initializeFrameworkWorkspace
+  initializeFrameworkWorkspace,
+  getAddonAgentFiles,
+  getAddonCommandFiles,
+  getAddonSkillDirs
 } from './base.mjs';
 
 // ============================================================================
@@ -298,28 +301,20 @@ export async function deploy(opts) {
   // Collect source files based on mode
   const agentFiles = [];
 
-  // Writing/general agents
-  if (mode === 'general' || mode === 'writing' || mode === 'both' || mode === 'all') {
-    const writingAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'agents');
-    agentFiles.push(...listMdFiles(writingAgentsDir));
-  }
-
-  // SDLC framework
+  // Frameworks
   if (mode === 'sdlc' || mode === 'both' || mode === 'all') {
     const sdlcAgentsDir = path.join(srcRoot, 'agentic', 'code', 'frameworks', 'sdlc-complete', 'agents');
     agentFiles.push(...listMdFiles(sdlcAgentsDir));
   }
 
-  // Marketing framework
   if (mode === 'marketing' || mode === 'all') {
     const marketingAgentsDir = path.join(srcRoot, 'agentic', 'code', 'frameworks', 'media-marketing-kit', 'agents');
     agentFiles.push(...listMdFiles(marketingAgentsDir));
   }
 
-  // Utils addon
-  if (mode === 'sdlc' || mode === 'all') {
-    const utilsAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'agents');
-    agentFiles.push(...listMdFiles(utilsAgentsDir));
+  // All addons (dynamically discovered)
+  if (mode === 'general' || mode === 'writing' || mode === 'sdlc' || mode === 'both' || mode === 'all') {
+    agentFiles.push(...getAddonAgentFiles(srcRoot));
   }
 
   // Deploy based on flags

package/tools/agents/providers/copilot.mjs

@@ -24,7 +24,9 @@ import {
   deployFiles,
   inferAgentCategory,
   toKebabCase,
-  initializeFrameworkWorkspace
+  initializeFrameworkWorkspace,
+  getAddonAgentFiles,
+  getAddonCommandFiles
 } from './base.mjs';
 
 // ============================================================================
@@ -348,17 +350,16 @@ export async function deploy(opts) {
   const agentFiles = [];
   const commandFiles = [];
 
-  // Collect files based on mode
-  if (mode === 'general' || mode === 'writing' || mode === 'both' || mode === 'all') {
-    const writingAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'agents');
-    agentFiles.push(...listMdFiles(writingAgentsDir));
+  // All addons (dynamically discovered)
+  if (mode === 'general' || mode === 'writing' || mode === 'sdlc' || mode === 'both' || mode === 'all') {
+    agentFiles.push(...getAddonAgentFiles(srcRoot));
 
     if (shouldDeployCommands || commandsOnly) {
-      const writingCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'commands');
-      commandFiles.push(...listMdFiles(writingCommandsDir));
+      commandFiles.push(...getAddonCommandFiles(srcRoot));
     }
   }
 
+  // Frameworks
   if (mode === 'sdlc' || mode === 'both' || mode === 'all') {
     const sdlcAgentsDir = path.join(srcRoot, 'agentic', 'code', 'frameworks', 'sdlc-complete', 'agents');
     agentFiles.push(...listMdFiles(sdlcAgentsDir));
@@ -379,16 +380,6 @@ export async function deploy(opts) {
     }
   }
 
-  if (mode === 'sdlc' || mode === 'all') {
-    const utilsAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'agents');
-    agentFiles.push(...listMdFiles(utilsAgentsDir));
-
-    if (shouldDeployCommands || commandsOnly) {
-      const utilsCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'commands');
-      commandFiles.push(...listMdFiles(utilsCommandsDir));
-    }
-  }
-
   // Deploy
   if (!commandsOnly) {
     console.log(`\nDeploying ${agentFiles.length} agents (YAML format)...`);

package/tools/agents/providers/factory.mjs

@@ -26,7 +26,9 @@ import {
   toKebabCase,
   stripJsonComments,
   createAgentsMdFromTemplate,
-  initializeFrameworkWorkspace
+  initializeFrameworkWorkspace,
+  getAddonAgentFiles,
+  getAddonCommandFiles
 } from './base.mjs';
 
 // ============================================================================
@@ -455,14 +457,12 @@ export async function deploy(opts) {
   const agentFiles = [];
   const commandFiles = [];
 
-  // Writing/general agents
-  if (mode === 'general' || mode === 'writing' || mode === 'both' || mode === 'all') {
-    const writingAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'agents');
-    agentFiles.push(...listMdFiles(writingAgentsDir));
+  // All addons (dynamically discovered)
+  if (mode === 'general' || mode === 'writing' || mode === 'sdlc' || mode === 'both' || mode === 'all') {
+    agentFiles.push(...getAddonAgentFiles(srcRoot));
 
     if (shouldDeployCommands || commandsOnly) {
-      const writingCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'commands');
-      commandFiles.push(...listMdFiles(writingCommandsDir));
+      commandFiles.push(...getAddonCommandFiles(srcRoot));
     }
   }
 
@@ -488,17 +488,6 @@ export async function deploy(opts) {
     }
   }
 
-  // Utils addon
-  if (mode === 'sdlc' || mode === 'all') {
-    const utilsAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'agents');
-    agentFiles.push(...listMdFiles(utilsAgentsDir));
-
-    if (shouldDeployCommands || commandsOnly) {
-      const utilsCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'commands');
-      commandFiles.push(...listMdFiles(utilsCommandsDir));
-    }
-  }
-
   // Deploy based on flags
   if (!commandsOnly) {
     console.log(`\nDeploying ${agentFiles.length} agents as droids...`);

package/tools/agents/providers/opencode.mjs

@@ -23,7 +23,9 @@ import {
   deployFiles,
   inferAgentCategory,
   createAgentsMdFromTemplate,
-  initializeFrameworkWorkspace
+  initializeFrameworkWorkspace,
+  getAddonAgentFiles,
+  getAddonCommandFiles
 } from './base.mjs';
 
 // ============================================================================
@@ -317,17 +319,16 @@ export async function deploy(opts) {
   const agentFiles = [];
   const commandFiles = [];
 
-  // Collect files based on mode
-  if (mode === 'general' || mode === 'writing' || mode === 'both' || mode === 'all') {
-    const writingAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'agents');
-    agentFiles.push(...listMdFiles(writingAgentsDir));
+  // All addons (dynamically discovered)
+  if (mode === 'general' || mode === 'writing' || mode === 'sdlc' || mode === 'both' || mode === 'all') {
+    agentFiles.push(...getAddonAgentFiles(srcRoot));
 
     if (shouldDeployCommands || commandsOnly) {
-      const writingCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'commands');
-      commandFiles.push(...listMdFiles(writingCommandsDir));
+      commandFiles.push(...getAddonCommandFiles(srcRoot));
     }
   }
 
+  // Frameworks
   if (mode === 'sdlc' || mode === 'both' || mode === 'all') {
     const sdlcAgentsDir = path.join(srcRoot, 'agentic', 'code', 'frameworks', 'sdlc-complete', 'agents');
     agentFiles.push(...listMdFiles(sdlcAgentsDir));
@@ -348,16 +349,6 @@ export async function deploy(opts) {
     }
   }
 
-  if (mode === 'sdlc' || mode === 'all') {
-    const utilsAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'agents');
-    agentFiles.push(...listMdFiles(utilsAgentsDir));
-
-    if (shouldDeployCommands || commandsOnly) {
-      const utilsCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'commands');
-      commandFiles.push(...listMdFiles(utilsCommandsDir));
-    }
-  }
-
   // Deploy
   if (!commandsOnly) {
     console.log(`\nDeploying ${agentFiles.length} agents...`);

package/tools/agents/providers/windsurf.mjs

@@ -22,7 +22,9 @@ import {
   ensureDir,
   listMdFiles,
   listMdFilesRecursive,
-  initializeFrameworkWorkspace
+  initializeFrameworkWorkspace,
+  getAddonAgentFiles,
+  getAddonCommandFiles
 } from './base.mjs';
 
 // ============================================================================
@@ -400,30 +402,22 @@ export async function deploy(opts) {
   // Collect all agent files based on mode
   const allAgentFiles = [];
 
-  // Writing agents
-  if (mode === 'general' || mode === 'writing' || mode === 'both' || mode === 'all') {
-    const writingAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'agents');
-    allAgentFiles.push(...listMdFiles(writingAgentsDir));
+  // All addons (dynamically discovered)
+  if (mode === 'general' || mode === 'writing' || mode === 'sdlc' || mode === 'both' || mode === 'all') {
+    allAgentFiles.push(...getAddonAgentFiles(srcRoot));
   }
 
-  // SDLC agents
+  // Frameworks
   if (mode === 'sdlc' || mode === 'both' || mode === 'all') {
     const sdlcAgentsDir = path.join(srcRoot, 'agentic', 'code', 'frameworks', 'sdlc-complete', 'agents');
     allAgentFiles.push(...listMdFiles(sdlcAgentsDir));
   }
 
-  // Marketing agents
   if (mode === 'marketing' || mode === 'all') {
     const marketingAgentsDir = path.join(srcRoot, 'agentic', 'code', 'frameworks', 'media-marketing-kit', 'agents');
     allAgentFiles.push(...listMdFiles(marketingAgentsDir));
   }
 
-  // Utils addon agents
-  if (mode === 'sdlc' || mode === 'all') {
-    const utilsAgentsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'aiwg-utils', 'agents');
-    allAgentFiles.push(...listMdFiles(utilsAgentsDir));
-  }
-
   // Generate aggregated AGENTS.md
   if (allAgentFiles.length > 0 && !commandsOnly && !skillsOnly) {
     const agentsMdPath = path.join(target, 'AGENTS.md');
@@ -442,11 +436,12 @@ export async function deploy(opts) {
     // Collect command files based on mode
     const commandFiles = [];
 
-    if (mode === 'general' || mode === 'both' || mode === 'all') {
-      const writingCommandsDir = path.join(srcRoot, 'agentic', 'code', 'addons', 'writing-quality', 'commands');
-      commandFiles.push(...listMdFiles(writingCommandsDir));
+    // All addons (dynamically discovered)
+    if (mode === 'general' || mode === 'writing' || mode === 'sdlc' || mode === 'both' || mode === 'all') {
+      commandFiles.push(...getAddonCommandFiles(srcRoot));
     }
 
+    // Frameworks
     if (mode === 'sdlc' || mode === 'both' || mode === 'all') {
       const sdlcCommandsDir = path.join(srcRoot, 'agentic', 'code', 'frameworks', 'sdlc-complete', 'commands');
       commandFiles.push(...listMdFilesRecursive(sdlcCommandsDir));