aiwg 2026.2.12 → 2026.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiwg",
-  "version": "2026.2.12",
+  "version": "2026.2.13",
   "description": "Cognitive architecture for AI-augmented software development with structured memory, ensemble validation, and closed-loop correction. FAIR-aligned artifacts, 84% cost reduction via human-in-the-loop, standards adopted by 100+ organizations.",
   "type": "module",
   "bin": {

package/tools/agents/providers/base.mjs

@@ -258,6 +258,38 @@ export function parseTools(toolsString) {
   return toolsString.split(/[,\s]+/).filter(Boolean);
 }
 
+// ============================================================================
+// Skill-Command Collision Detection
+// ============================================================================
+
+/**
+ * Filter out commands that share a name with a skill.
+ * Skills are the richer format (triggers, NL routing, behavior spec) and take precedence.
+ *
+ * @param {string[]} commandFiles - Array of command file paths
+ * @param {string[]} skillDirs - Array of skill directory paths
+ * @returns {string[]} Filtered command files with collisions removed
+ */
+export function filterCommandsAgainstSkills(commandFiles, skillDirs) {
+  if (!skillDirs.length || !commandFiles.length) return commandFiles;
+
+  // Build set of skill names (directory basenames, without extension)
+  const skillNames = new Set(skillDirs.map(d => path.basename(d)));
+
+  const filtered = [];
+  for (const f of commandFiles) {
+    // Command name is the filename without extension
+    const commandName = path.basename(f).replace(/\.\w+$/, '');
+    if (skillNames.has(commandName)) {
+      console.log(`skip (skill precedence): command "${commandName}" — skill with same name takes precedence`);
+    } else {
+      filtered.push(f);
+    }
+  }
+
+  return filtered;
+}
+
 // ============================================================================
 // File Deployment
 // ============================================================================

package/tools/agents/providers/claude.mjs

@@ -30,7 +30,8 @@ import {
   getAddonRuleFiles,
   normalizeDeploymentMode,
   collectFrameworkArtifacts,
-  cleanupOldRuleFiles
+  cleanupOldRuleFiles,
+  filterCommandsAgainstSkills
 } from './base.mjs';
 
 // ============================================================================
@@ -353,9 +354,14 @@ export async function deploy(opts) {
     deployAgents(filteredAgents, target, opts);
   }
 
+  // Filter commands that collide with skills (skills take precedence)
+  const filteredCommands = (shouldDeploySkills || skillsOnly)
+    ? filterCommandsAgainstSkills(commandFiles, skillDirs)
+    : commandFiles;
+
   if (shouldDeployCommands || commandsOnly) {
-    console.log(`\nDeploying ${commandFiles.length} commands...`);
-    deployCommands(commandFiles, target, opts);
+    console.log(`\nDeploying ${filteredCommands.length} commands...`);
+    deployCommands(filteredCommands, target, opts);
   }
 
   if (shouldDeploySkills || skillsOnly) {

package/tools/agents/providers/codex.mjs

@@ -37,7 +37,8 @@ import {
   getFrameworksForMode,
   normalizeDeploymentMode,
   getRulesIndexPath,
-  cleanupOldRuleFiles
+  cleanupOldRuleFiles,
+  filterCommandsAgainstSkills
 } from './base.mjs';
 
 // ============================================================================

package/tools/agents/providers/copilot.mjs

@@ -35,7 +35,8 @@ import {
   deploySkillDir,
   normalizeDeploymentMode,
   collectFrameworkArtifacts,
-  cleanupOldRuleFiles
+  cleanupOldRuleFiles,
+  filterCommandsAgainstSkills
 } from './base.mjs';
 
 // ============================================================================
@@ -430,9 +431,14 @@ export async function deploy(opts) {
     deployAgents(agentFiles, target, opts);
   }
 
+  // Filter commands that collide with skills (skills take precedence)
+  const filteredCommands = (shouldDeploySkills || skillsOnly)
+    ? filterCommandsAgainstSkills(commandFiles, skillDirs)
+    : commandFiles;
+
   if (shouldDeployCommands || commandsOnly) {
-    console.log(`\nDeploying ${commandFiles.length} commands as agents (YAML format)...`);
-    deployCommands(commandFiles, target, opts);
+    console.log(`\nDeploying ${filteredCommands.length} commands as agents (YAML format)...`);
+    deployCommands(filteredCommands, target, opts);
   }
 
   if (shouldDeploySkills || skillsOnly) {

package/tools/agents/providers/cursor.mjs

@@ -37,7 +37,8 @@ import {
   initializeFrameworkWorkspace,
   normalizeDeploymentMode,
   collectFrameworkArtifacts,
-  cleanupOldRuleFiles
+  cleanupOldRuleFiles,
+  filterCommandsAgainstSkills
 } from './base.mjs';
 
 // ============================================================================
@@ -363,9 +364,14 @@ export async function deploy(opts) {
     deployAgents(filteredAgents, target, opts);
   }
 
+  // Filter commands that collide with skills (skills take precedence)
+  const filteredCommands = (shouldDeploySkills || skillsOnly)
+    ? filterCommandsAgainstSkills(commandFiles, skillDirs)
+    : commandFiles;
+
   if (shouldDeployCommands || commandsOnly) {
-    console.log(`\nDeploying ${commandFiles.length} commands...`);
-    deployCommands(commandFiles, target, opts);
+    console.log(`\nDeploying ${filteredCommands.length} commands...`);
+    deployCommands(filteredCommands, target, opts);
   }
 
   if (shouldDeploySkills || skillsOnly) {

package/tools/agents/providers/factory.mjs

@@ -37,7 +37,8 @@ import {
   deploySkillDir,
   normalizeDeploymentMode,
   collectFrameworkArtifacts,
-  cleanupOldRuleFiles
+  cleanupOldRuleFiles,
+  filterCommandsAgainstSkills
 } from './base.mjs';
 
 // ============================================================================
@@ -537,9 +538,14 @@ export async function deploy(opts) {
     deployAgents(agentFiles, target, opts);
   }
 
+  // Filter commands that collide with skills (skills take precedence)
+  const filteredCommands = (shouldDeploySkills || skillsOnly)
+    ? filterCommandsAgainstSkills(commandFiles, skillDirs)
+    : commandFiles;
+
   if (shouldDeployCommands || commandsOnly) {
-    console.log(`\nDeploying ${commandFiles.length} commands...`);
-    deployCommands(commandFiles, target, opts);
+    console.log(`\nDeploying ${filteredCommands.length} commands...`);
+    deployCommands(filteredCommands, target, opts);
   }
 
   if (shouldDeploySkills || skillsOnly) {

package/tools/agents/providers/opencode.mjs

@@ -34,7 +34,8 @@ import {
   deploySkillDir,
   normalizeDeploymentMode,
   collectFrameworkArtifacts,
-  cleanupOldRuleFiles
+  cleanupOldRuleFiles,
+  filterCommandsAgainstSkills
 } from './base.mjs';
 
 // ============================================================================
@@ -399,9 +400,14 @@ export async function deploy(opts) {
     deployAgents(agentFiles, target, opts);
   }
 
+  // Filter commands that collide with skills (skills take precedence)
+  const filteredCommands = (shouldDeploySkills || skillsOnly)
+    ? filterCommandsAgainstSkills(commandFiles, skillDirs)
+    : commandFiles;
+
   if (shouldDeployCommands || commandsOnly) {
-    console.log(`\nDeploying ${commandFiles.length} commands...`);
-    deployCommands(commandFiles, target, opts);
+    console.log(`\nDeploying ${filteredCommands.length} commands...`);
+    deployCommands(filteredCommands, target, opts);
   }
 
   if (shouldDeploySkills || skillsOnly) {

package/tools/agents/providers/warp.mjs

@@ -38,7 +38,8 @@ import {
   getAddonRuleFiles,
   normalizeDeploymentMode,
   collectFrameworkArtifacts,
-  cleanupOldRuleFiles
+  cleanupOldRuleFiles,
+  filterCommandsAgainstSkills
 } from './base.mjs';
 
 // ============================================================================
@@ -365,9 +366,14 @@ export async function deploy(opts) {
     deployAgents(filteredAgents, target, opts);
   }
 
+  // Filter commands that collide with skills (skills take precedence)
+  const filteredCommands = (shouldDeploySkills || skillsOnly)
+    ? filterCommandsAgainstSkills(commandFiles, skillDirs)
+    : commandFiles;
+
   if (shouldDeployCommands || commandsOnly) {
-    console.log(`\nDeploying ${commandFiles.length} commands...`);
-    deployCommands(commandFiles, target, opts);
+    console.log(`\nDeploying ${filteredCommands.length} commands...`);
+    deployCommands(filteredCommands, target, opts);
   }
 
   if (shouldDeploySkills || skillsOnly) {

package/tools/agents/providers/windsurf.mjs

@@ -35,7 +35,8 @@ import {
   deployFiles,
   normalizeDeploymentMode,
   collectFrameworkArtifacts,
-  cleanupOldRuleFiles
+  cleanupOldRuleFiles,
+  filterCommandsAgainstSkills
 } from './base.mjs';
 
 // ============================================================================
@@ -478,6 +479,23 @@ export async function deploy(opts) {
     generateWindsurfRules(srcRoot, target, opts);
   }
 
+  // Collect skill directories early so we can filter command collisions
+  const skillDirs = [];
+  if (shouldDeploySkills || skillsOnly) {
+    // All addons (dynamically discovered)
+    if (normalizedMode === 'general' || normalizedMode === 'sdlc' || normalizedMode === 'both' || normalizedMode === 'all') {
+      skillDirs.push(...getAddonSkillDirs(srcRoot));
+    }
+
+    const frameworkSkills = collectFrameworkArtifacts(srcRoot, normalizedMode, {
+      includeAgents: false,
+      includeCommands: false,
+      includeSkills: true,
+      includeRules: false
+    });
+    skillDirs.push(...frameworkSkills.skills);
+  }
+
   // Deploy commands as Windsurf workflows
   if (deployCommands || commandsOnly) {
     // Collect command files based on mode
@@ -497,33 +515,20 @@ export async function deploy(opts) {
     });
     commandFiles.push(...frameworkCommands.commands);
 
-    if (commandFiles.length > 0) {
-      deployWorkflows(commandFiles, target, opts);
+    // Filter commands that collide with skills (skills take precedence)
+    const filteredCommands = skillDirs.length > 0
+      ? filterCommandsAgainstSkills(commandFiles, skillDirs)
+      : commandFiles;
+
+    if (filteredCommands.length > 0) {
+      deployWorkflows(filteredCommands, target, opts);
     }
   }
 
   // Deploy skills
-  if (shouldDeploySkills || skillsOnly) {
-    // Collect skill directories based on mode
-    const skillDirs = [];
-
-    // All addons (dynamically discovered)
-    if (normalizedMode === 'general' || normalizedMode === 'sdlc' || normalizedMode === 'both' || normalizedMode === 'all') {
-      skillDirs.push(...getAddonSkillDirs(srcRoot));
-    }
-
-    const frameworkSkills = collectFrameworkArtifacts(srcRoot, normalizedMode, {
-      includeAgents: false,
-      includeCommands: false,
-      includeSkills: true,
-      includeRules: false
-    });
-    skillDirs.push(...frameworkSkills.skills);
-
-    if (skillDirs.length > 0) {
-      console.log(`\nDeploying ${skillDirs.length} skills...`);
-      deploySkills(skillDirs, target, opts);
-    }
+  if (skillDirs.length > 0 && (shouldDeploySkills || skillsOnly)) {
+    console.log(`\nDeploying ${skillDirs.length} skills...`);
+    deploySkills(skillDirs, target, opts);
   }
 
   // Deploy rules

package/tools/commands/deploy-prompts-codex.mjs

@@ -24,7 +24,7 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { getFrameworksForMode, normalizeDeploymentMode } from '../agents/providers/base.mjs';
+import { getFrameworksForMode, normalizeDeploymentMode, getAddonSkillDirs, listSkillDirs, collectFrameworkArtifacts } from '../agents/providers/base.mjs';
 
 const CODEX_PROMPTS_DIR = path.join(os.homedir(), '.codex', 'prompts');
 
@@ -283,6 +283,15 @@ function getCommandDirectories(srcRoot, mode) {
     ensureDir(target);
   }
 
+  // Collect skill names to detect command/skill collisions
+  const skillNames = new Set();
+  const addonSkills = getAddonSkillDirs(srcRoot);
+  for (const d of addonSkills) skillNames.add(path.basename(d));
+  const frameworkSkills = collectFrameworkArtifacts(srcRoot, mode, {
+    includeAgents: false, includeCommands: false, includeSkills: true, includeRules: false
+  });
+  for (const d of frameworkSkills.skills) skillNames.add(path.basename(d));
+
   // Get command directories based on mode
   const commandDirs = getCommandDirectories(srcRoot, mode);
   let totalDeployed = 0;
@@ -295,6 +304,13 @@ function getCommandDirectories(srcRoot, mode) {
     console.log(`\n${label} (${commandFiles.length} prompts):`);
 
     for (const commandFile of commandFiles) {
+      // Skip commands that collide with skills (skills take precedence)
+      const commandName = path.basename(commandFile, '.md');
+      if (skillNames.has(commandName)) {
+        console.log(`  skip (skill precedence): command "${commandName}" — skill with same name takes precedence`);
+        totalSkipped++;
+        continue;
+      }
       try {
         const prompt = transformToCodexPrompt(commandFile, prefix);
         const result = deployPrompt(prompt, target, { force, dryRun });