@aiwg/cli 2026.8.8 → 2026.8.11

package/tools/agents/providers/base.mjs

@@ -44,6 +44,48 @@ export function ensureDir(d, dryRun = false) {
   if (!fs.existsSync(d)) fs.mkdirSync(d, { recursive: true });
 }
 
+const PROJECT_ARTIFACT_ENV_KEYS = [
+  'AIWG_ARTIFACTS_PATH',
+  'AIWG_PROJECT_ARTIFACTS_PATH',
+  'AIWG_PROJECT_AIWG_DIR',
+];
+
+function expandProjectArtifactPath(value, projectDir) {
+  const trimmed = value.trim();
+  if (trimmed === '~') return os.homedir();
+  if (trimmed.startsWith('~/')) return path.resolve(os.homedir(), trimmed.slice(2));
+  return path.isAbsolute(trimmed) ? trimmed : path.resolve(projectDir, trimmed);
+}
+
+function parseProjectArtifactLocation(contents) {
+  for (const rawLine of contents.split(/\r?\n/)) {
+    let line = rawLine.trim();
+    if (!line || line.startsWith('#')) continue;
+    if (line.startsWith('export ')) line = line.slice('export '.length).trim();
+    const assignment = line.match(/^AIWG_ARTIFACTS_PATH\s*=\s*(.+)$/);
+    if (assignment) line = assignment[1].trim();
+    if ((line.startsWith('"') && line.endsWith('"')) || (line.startsWith("'") && line.endsWith("'"))) {
+      line = line.slice(1, -1);
+    }
+    return line || null;
+  }
+  return null;
+}
+
+/** Resolve the artifact corpus root used for framework-generated workspace data. */
+export function resolveFrameworkWorkspaceRoot(projectDir, env = process.env) {
+  for (const key of PROJECT_ARTIFACT_ENV_KEYS) {
+    const value = env[key];
+    if (typeof value === 'string' && value.trim()) return expandProjectArtifactPath(value, projectDir);
+  }
+  const pointer = path.join(projectDir, '.aiwg-location');
+  if (fs.existsSync(pointer)) {
+    const configured = parseProjectArtifactLocation(fs.readFileSync(pointer, 'utf8'));
+    if (configured) return expandProjectArtifactPath(configured, projectDir);
+  }
+  return path.join(projectDir, '.aiwg');
+}
+
 /**
  * List markdown files in a directory (non-recursive)
  */
@@ -138,8 +180,11 @@ const MANIFEST_FILENAME = '.aiwg-manifest.json';
  *
  * Idempotent — skips if either form of the marker is already present.
  */
-export function addManagedMarker(content, version, source) {
+export function addManagedMarker(content, version, source, style = 'markdown') {
   if (MANAGED_MARKER_RE.test(content)) return content;
+  if (style === 'line-comment') {
+    return `# aiwg:managed v${version} ${source}\n${content}`;
+  }
   // Frontmatter present → inject as YAML comment after the opening `---\n`.
   if (content.startsWith('---\n')) {
     return content.replace(
@@ -638,9 +683,18 @@ export function deployFiles(files, destDir, opts, transformFn) {
       transformedContent = injectPlatformInContent(transformedContent, platformName);
     }
 
-    // Add managed marker for .md / .mdc files (#749; .mdc for Cursor native rules)
+    // Add managed marker for provider artifacts (#749). TOML accepts `#`
+    // comments, which lets doctor attribute transformed Codex agents even
+    // though their YAML frontmatter is removed during serialization.
     if (base.endsWith('.md') || base.endsWith('.mdc')) {
       transformedContent = addManagedMarker(transformedContent, deployVersion, deploySource);
+    } else if (base.endsWith('.toml')) {
+      transformedContent = addManagedMarker(
+        transformedContent,
+        deployVersion,
+        deploySource,
+        'line-comment',
+      );
     }
 
     // Compute content hash for sidecar comparison
@@ -1441,7 +1495,7 @@ export function deploySkillDir(skillDir, destDir, opts) {
  * Creates .aiwg/frameworks/{framework-id}/ directories
  */
 export function initializeFrameworkWorkspace(target, mode, dryRun, srcRoot = null) {
-  const aiwgBase = path.join(target, '.aiwg');
+  const aiwgBase = resolveFrameworkWorkspaceRoot(target);
   const frameworksDir = path.join(aiwgBase, 'frameworks');
   const sharedDir = path.join(aiwgBase, 'shared');
 
@@ -1498,7 +1552,7 @@ export function initializeFrameworkWorkspace(target, mode, dryRun, srcRoot = nul
       }
       for (const entry of fw.memoryCreates || []) {
         if (entry && typeof entry.path === 'string') {
-          console.log(`[dry-run]   ${path.join(target, entry.path)}${entry.path.endsWith('/') ? '/' : ''}`);
+          console.log(`[dry-run]   ${path.join(aiwgBase, entry.path.slice('.aiwg/'.length))}${entry.path.endsWith('/') ? '/' : ''}`);
         }
       }
     }
@@ -1515,7 +1569,7 @@ export function initializeFrameworkWorkspace(target, mode, dryRun, srcRoot = nul
     for (const subdir of fw.subdirs) {
       ensureDir(path.join(fwBase, subdir));
     }
-    initializeMemoryCreates(target, fw.path, fw.memoryCreates);
+    initializeMemoryCreates(aiwgBase, fw.path, fw.memoryCreates);
   }
 
   // Initialize registry.json if it doesn't exist
@@ -1536,12 +1590,12 @@ export function initializeFrameworkWorkspace(target, mode, dryRun, srcRoot = nul
 }
 
 
-function initializeMemoryCreates(target, frameworkPath, creates) {
+function initializeMemoryCreates(aiwgBase, frameworkPath, creates) {
   for (const entry of creates || []) {
     if (!entry || typeof entry.path !== 'string') continue;
     if (!entry.path.startsWith('.aiwg/')) continue;
 
-    const targetPath = path.join(target, entry.path);
+    const targetPath = path.join(aiwgBase, entry.path.slice('.aiwg/'.length));
     const isDirectory = entry.path.endsWith('/') || path.extname(entry.path) === '';
     if (isDirectory) {
       ensureDir(targetPath);

package/tools/agents/providers/openclaw.mjs

@@ -209,10 +209,13 @@ function deploySkills(skillDirs, opts) {
     ? skillDirs
     : skillDirs.filter(d => isKernelSkill(d));
   if (crossAgentSkills.length > 0) {
-    const crossAgentDir = path.join(process.cwd(), '.agents', 'skills');
+    // Honor the deployment target selected by `aiwg use --target`. Provider
+    // subprocesses execute from AIWG_ROOT so process.cwd() would otherwise
+    // mutate the framework checkout during isolated/project-targeted deploys.
+    const crossAgentDir = path.join(opts.target || process.cwd(), '.agents', 'skills');
     ensureDir(crossAgentDir, opts.dryRun);
     if (!opts.dryRun) {
-      console.log(`Deploying cross-agent skills to ${path.relative(process.cwd(), crossAgentDir)}...`);
+      console.log(`Deploying cross-agent skills to ${path.relative(opts.target || process.cwd(), crossAgentDir)}...`);
     } else {
       console.log(`[dry-run] Would deploy cross-agent skills to .agents/skills/`);
     }

package/tools/agents/providers/windsurf.mjs

@@ -1,7 +1,9 @@
 /**
- * Windsurf Provider (EXPERIMENTAL)
+ * Devin Desktop Provider (Windsurf compatibility adapter)
  *
- * Deploys agents to Windsurf format with aggregated AGENTS.md and trigger-frontmatter rules.
+ * Deploys agents to the Devin Desktop/Windsurf compatibility surface with
+ * aggregated AGENTS.md and trigger-frontmatter rules. The provider id and
+ * generated `.windsurf/` paths remain stable for backward compatibility.
  *
  * Deployment paths:
  *   - Output: AGENTS.md (aggregated agents)
@@ -18,7 +20,7 @@
  *   - Capabilities tags for tools
  *   - Workflow format for commands
  *   - Conventional skills and rules deployment
- *   - EXPERIMENTAL: Untested, may require adjustments
+ *   - Devin Desktop selectors resolve to the stable `windsurf` provider id
  */
 
 import realFs from 'fs';
@@ -57,7 +59,7 @@ import {
 // ============================================================================
 
 export const name = 'windsurf';
-export const aliases = [];
+export const aliases = ['devin', 'devin-desktop', 'devin-local', 'cascade'];
 
 export const paths = {
   agents: '.windsurf/agents/',      // Discrete mirrors alongside AGENTS.md
@@ -85,17 +87,6 @@ export const capabilities = {
   yamlFormat: false
 };
 
-// ============================================================================
-// Warning Display
-// ============================================================================
-
-function displayWarning() {
-  console.log('\n' + '='.repeat(70));
-  console.log('[EXPERIMENTAL] Windsurf provider support is experimental and untested.');
-  console.log('Please report issues: https://github.com/jmagly/aiwg/issues');
-  console.log('='.repeat(70) + '\n');
-}
-
 // ============================================================================
 // Content Transformation
 // ============================================================================
@@ -253,12 +244,12 @@ export function generateAgentsMd(files, destPath, opts) {
   // refuses to replace the legacy 2MB+ aggregate writer's output.
   lines.push('<!-- aiwg-managed -->');
   lines.push('');
-  lines.push('> AIWG Agent Directory for Windsurf');
+  lines.push('> AIWG Agent Directory for Devin Desktop');
   lines.push('');
   lines.push('<!--');
-  lines.push('  [EXPERIMENTAL] Generated by AIWG for Windsurf');
-  lines.push('  Windsurf reads this file for directory-scoped AI instructions.');
-  lines.push('  See: https://docs.windsurf.com/windsurf/cascade/agents-md');
+  lines.push('  Generated by AIWG for Devin Desktop using the Windsurf compatibility adapter.');
+  lines.push('  Devin Desktop reads this file for directory-scoped AI instructions.');
+  lines.push('  See: https://docs.devin.ai/onboard-devin/agents-md');
   lines.push('-->');
   lines.push('');
   lines.push('## Table of Contents');
@@ -316,10 +307,10 @@ export function generateWindsurfRules(srcRoot, target, opts) {
   lines.push('trigger: always_on');
   lines.push('---');
   lines.push('');
-  lines.push('# AIWG Orchestration for Windsurf');
+  lines.push('# AIWG Orchestration for Devin Desktop');
   lines.push('');
   lines.push('<!--');
-  lines.push('  [EXPERIMENTAL] Generated by AIWG for Windsurf');
+  lines.push('  Generated by AIWG for Devin Desktop using the Windsurf compatibility adapter.');
   lines.push('  This file provides orchestration context for AIWG SDLC workflows.');
   lines.push('  trigger: always_on — included in system prompt on every message.');
   lines.push('-->');
@@ -556,9 +547,7 @@ export async function deploy(opts) {
     dryRun
   } = opts;
 
-  displayWarning();
-
-  console.log(`\n=== Windsurf Provider (EXPERIMENTAL) ===`);
+  console.log(`\n=== Devin Desktop Provider (windsurf compatibility adapter) ===`);
   console.log(`Target: ${target}`);
   console.log(`Mode: ${mode}`);
   const normalizedMode = normalizeDeploymentMode(mode);

package/tools/skills/deploy-skills-codex.mjs

@@ -417,6 +417,17 @@ function isFullAiwgSourceRoot(srcRoot) {
   const repoRoot = path.resolve(scriptDir, '..', '..');
   const srcRoot = source || repoRoot;
   const fullAiwgSourceRoot = isFullAiwgSourceRoot(srcRoot);
+  const copyStandardSkills = cfg.copyStandardSkills === true;
+  // Component-scoped deploys (the way `aiwg use all` installs selected
+  // frameworks/addons) still need a complete inventory for stale-skill
+  // reconciliation.  AIWG_ROOT is supplied by the orchestrator for exactly
+  // this purpose; fall back to the script checkout for standalone use.
+  const configuredAiwgRoot = process.env.AIWG_ROOT
+    ? path.resolve(process.env.AIWG_ROOT)
+    : repoRoot;
+  const inventoryRoot = fullAiwgSourceRoot
+    ? srcRoot
+    : (!copyStandardSkills && isFullAiwgSourceRoot(configuredAiwgRoot) ? configuredAiwgRoot : null);
 
   console.log(`Deploying skills to Codex`);
   console.log(`  Source: ${srcRoot}`);
@@ -440,8 +451,6 @@ function isFullAiwgSourceRoot(srcRoot) {
   // Codex normally deploys to the project `.agents/skills/` target, so the
   // kernel/standard split is enforced at filter time rather than via separate
   // destination directories. The standalone legacy default remains supported.
-  const copyStandardSkills = cfg.copyStandardSkills === true;
-
   // Track every AIWG-managed source skill name so we can scope post-deploy
   // cleanup to skills AIWG ships — never delete user-authored or
   // third-party skills sitting alongside.
@@ -457,10 +466,13 @@ function isFullAiwgSourceRoot(srcRoot) {
   // so full-root cleanup can remove stale AIWG skills. Component-scoped
   // cleanup is limited below to names owned by that component, preserving
   // user-authored skills alongside the generated set.
-  for (const { dir } of getSkillDirectories(srcRoot, 'all')) {
+  for (const { dir } of getSkillDirectories(inventoryRoot || srcRoot, 'all')) {
     const allSkills = findSkillDirs(dir);
     for (const s of allSkills) {
       allManagedNames.add(path.basename(s));
+      if (!copyStandardSkills && isKernelSkill(s)) {
+        desiredNames.add(path.basename(s));
+      }
       // Also record the frontmatter `name:` since Codex uses that as the
       // target dir. Best-effort — ignore parse errors.
       try {
@@ -469,7 +481,11 @@ function isFullAiwgSourceRoot(srcRoot) {
         if (fmMatch) {
           const nameMatch = fmMatch[1].match(/^\s*name:\s*(.+?)\s*$/m);
           if (nameMatch) {
-            allManagedNames.add(stripWrappingQuotes(nameMatch[1]));
+            const deployedName = stripWrappingQuotes(nameMatch[1]);
+            allManagedNames.add(deployedName);
+            if (!copyStandardSkills && isKernelSkill(s)) {
+              desiredNames.add(deployedName);
+            }
           }
         }
       } catch { /* ignore */ }
@@ -528,7 +544,7 @@ function isFullAiwgSourceRoot(srcRoot) {
       // the .aiwg-managed marker. Treat only the exact historical names as
       // managed so malformed legacy frontmatter cannot survive an upgrade.
       let isAiwgManaged = allManagedNames.has(name) || LEGACY_RENAMED_SKILLS.has(name);
-      if (!isAiwgManaged && fullAiwgSourceRoot) {
+      if (!isAiwgManaged && (fullAiwgSourceRoot || inventoryRoot)) {
         // Check for the .aiwg-managed marker file (preferred — survives
         // frontmatter transforms) or fall back to namespace check.
         const markerFile = path.join(target, name, '.aiwg-managed');