adaptive-director-skill 1.1.0 → 1.1.2

package/scripts/delegate-cli.mjs

@@ -0,0 +1,106 @@
+#!/usr/bin/env node
+import { execFileSync, spawnSync } from 'node:child_process';
+import { existsSync, readFileSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { homedir } from 'node:os';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+const args = process.argv.slice(2);
+const subcmd = args[0] || 'help';
+
+function run(script, scriptArgs = []) {
+  try {
+    const out = execFileSync(process.execPath, [script, ...scriptArgs], {
+      encoding: 'utf8',
+      timeout: 15000,
+      cwd: process.cwd(),
+      env: process.env,
+    });
+    return JSON.parse(out.trim());
+  } catch {
+    return null;
+  }
+}
+
+if (subcmd === 'help' || subcmd === '--help' || subcmd === '-h') {
+  console.log(`Adaptive Director — Delegate Skills Management
+
+Usage:
+  adaptive-director delegate <subcommand> [options]
+
+Subcommands:
+  install   Install delegate-skills via official installer and update config
+  status    Display delegate-skills discovery, detected relays, and lanes
+  help      Show this help message
+
+Examples:
+  adaptive-director delegate install
+  adaptive-director delegate status
+`);
+  process.exit(0);
+}
+
+if (subcmd === 'install') {
+  const setupScript = join(__dirname, 'setup.mjs');
+  const forwardArgs = [setupScript, '--with-delegate', '--delegate-only', ...args.slice(1)];
+  const res = spawnSync(process.execPath, forwardArgs, {
+    stdio: 'inherit',
+    env: process.env,
+  });
+  process.exit(res.status ?? 0);
+}
+
+if (subcmd === 'status') {
+  console.log('\nAdaptive Director — Delegate Integration Status\n');
+
+  const configPath = join(homedir(), '.adaptive-director', 'config.json');
+  let config = {};
+  if (existsSync(configPath)) {
+    try {
+      config = JSON.parse(readFileSync(configPath, 'utf8'));
+    } catch {}
+  }
+
+  const discovery = run(join(__dirname, 'discover.mjs'));
+  const ds = discovery?.delegateSkills ?? { installed: false, relays: [], lanes: {} };
+
+  console.log(`  Installed:           ${ds.installed ? 'Yes' : 'No'}`);
+  console.log(`  Config execution:    ${config.execution || 'native'}`);
+  console.log(`  Config enabled:      ${config.delegate?.enabled ?? config.delegateEnabled ?? false}`);
+  if (config.delegate?.lastInstallAttempt) {
+    console.log(`  Last install attempt: ${config.delegate.lastInstallAttempt}`);
+  }
+
+  const skills = ds.skills ?? ds.relays ?? [];
+  const relays = ds.relays ?? [];
+  console.log(`\n  Detected Delegate Skills (${skills.length}):`);
+  if (skills.length > 0) {
+    for (const s of skills) {
+      const isRelay = relays.includes(s);
+      console.log(`    - ${s}${isRelay ? ' (execution relay)' : ''}`);
+    }
+  } else {
+    console.log('    (none detected)');
+  }
+
+  const lanes = ds.lanes ?? {};
+  const laneKeys = Object.keys(lanes);
+  console.log(`\n  Active Execution Lanes (${laneKeys.length}):`);
+  if (laneKeys.length > 0) {
+    for (const k of laneKeys) {
+      const lane = lanes[k];
+      console.log(`    - ${k}: agent=${lane.agent || lane.implementer || 'unknown'}${lane.model ? `, model=${lane.model}` : ''}`);
+    }
+  } else {
+    console.log('    (none configured)');
+  }
+
+  console.log('');
+  process.exit(0);
+}
+
+console.error(`Unknown delegate subcommand: ${subcmd}`);
+console.log(`Run 'adaptive-director delegate help' for usage.`);
+process.exit(1);

package/scripts/discover.mjs

@@ -13,7 +13,7 @@
  */
 
 import { execFileSync, execSync } from 'node:child_process'
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, readFileSync, readdirSync } from 'node:fs'
 import { join } from 'node:path'
 import { homedir } from 'node:os'
 import { discoverHostModels } from '../skills/adaptive-director/scripts/discover-models.mjs'
@@ -53,16 +53,27 @@ function findBinary(bins) {
   return null
 }
 
-function getVersion(bin, args) {
-  try {
-    const out = execFileSync(bin, args, {
-      encoding: 'utf8', timeout: 5000, stdio: ['ignore', 'pipe', 'ignore']
-    })
-    return out.trim().split('\n')[0].trim()
-  } catch {
-    return null
-  }
-}
+function getVersion(bin, args) {
+  try {
+    const out = execFileSync(bin, args, {
+      encoding: 'utf8', timeout: 5000, stdio: ['ignore', 'pipe', 'ignore']
+    })
+    return out.trim().split('\n')[0].trim()
+  } catch {
+    if (process.platform !== 'win32') return null
+    try {
+      const quotedBin = `"${bin.replace(/"/g, '""')}"`
+      const quotedArgs = args.map(a => `"${String(a).replace(/"/g, '""')}"`).join(' ')
+      const out = execSync(`${quotedBin} ${quotedArgs}`, {
+        encoding: 'utf8', timeout: 5000, stdio: ['ignore', 'pipe', 'ignore'],
+        windowsHide: true,
+      })
+      return out.trim().split('\n')[0].trim()
+    } catch {
+      return null
+    }
+  }
+}
 
 // ─── Delegate-skills fleet ────────────────────────────────────────────────────
 
@@ -145,16 +156,44 @@ function discoverDelegate() {
     } catch {}
   }
 
-  const installed = Object.keys(lanes).length > 0 || hasAgentsSkills || hasSkillLock
+  // Detect installed delegate relays across candidate directories
+  const relayDirs = [
+    agentsSkillsDir,
+    codexSkillsDir,
+    join(process.cwd(), '.agents', 'skills'),
+    join(process.cwd(), 'delegate-skills', 'skills'),
+    join(homedir(), '.skills', 'amElnagdy', 'delegate-skills', 'skills'),
+  ]
+  const skillsSet = new Set()
+  const relaysSet = new Set()
+  for (const dir of relayDirs) {
+    if (!existsSync(dir)) continue
+    try {
+      const entries = readdirSync(dir, { withFileTypes: true })
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue
+        if (entry.name.endsWith('-delegate') || entry.name === 'delegate-setup' || entry.name.startsWith('delegate-')) {
+          skillsSet.add(entry.name)
+          if (entry.name.endsWith('-delegate')) {
+            relaysSet.add(entry.name)
+          }
+        }
+      }
+    } catch {}
+  }
+  const skills = Array.from(skillsSet).sort()
+  const relays = Array.from(relaysSet).sort()
+
+  const installed = Object.keys(lanes).length > 0 || hasAgentsSkills || hasSkillLock || skills.length > 0
 
   // If installed but no explicit fleet lanes file configured, synthesize lanes from installed delegate skills
-  if (installed && Object.keys(lanes).length === 0 && hasAgentsSkills) {
-    if (existsSync(join(agentsSkillsDir, 'codex-delegate'))) {
+  if (installed && Object.keys(lanes).length === 0 && (hasAgentsSkills || relays.length > 0)) {
+    if (relays.includes('codex-delegate') || existsSync(join(agentsSkillsDir, 'codex-delegate'))) {
       lanes.feature = { agent: 'codex', implementer: 'codex' }
       lanes.implement = { agent: 'codex', implementer: 'codex' }
       lanes.fix = { agent: 'codex', implementer: 'codex' }
     }
-    if (existsSync(join(agentsSkillsDir, 'agy-delegate'))) {
+    if (relays.includes('agy-delegate') || existsSync(join(agentsSkillsDir, 'agy-delegate'))) {
       lanes.plan = { agent: 'agy', implementer: 'agy' }
       lanes.review = { agent: 'agy', implementer: 'agy' }
       lanes.verify = { agent: 'agy', implementer: 'agy' }
@@ -164,7 +203,9 @@ function discoverDelegate() {
   return {
     installed,
     lanes,
-    source: hasSkillLock ? 'amElnagdy/delegate-skills' : (hasAgentsSkills ? 'local-skills' : (Object.keys(lanes).length > 0 ? 'fleet-config' : null))
+    skills,
+    relays,
+    source: hasSkillLock ? 'amElnagdy/delegate-skills' : (hasAgentsSkills ? 'local-skills' : (Object.keys(lanes).length > 0 ? 'fleet-config' : (skills.length > 0 ? 'detected-skills' : null)))
   }
 }
 

package/scripts/doctor.mjs

@@ -7,11 +7,12 @@ import { fileURLToPath } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-function run(script, args = []) {
+function run(script, args = [], env = process.env) {
   try {
     const out = execFileSync(process.execPath, [script, ...args], {
       encoding: 'utf8', timeout: 15000,
       cwd: process.cwd(),
+      env,
     });
     return JSON.parse(out.trim());
   } catch {
@@ -65,9 +66,10 @@ if (check('Registry exists', existsSync(registryPath))) {
 }
 
 // ── Config ────────────────────────────────────────────────────────────────
+let configObj = null;
 if (check('Config exists', existsSync(configPath), 'adaptive-director setup')) {
   try {
-    JSON.parse(readFileSync(configPath, 'utf8'));
+    configObj = JSON.parse(readFileSync(configPath, 'utf8'));
     check('Config valid', true);
   } catch {
     allGood &= check('Config valid', false, 'rm ~/.adaptive-director/config.json && adaptive-director setup');
@@ -99,7 +101,7 @@ allGood &= check('Resume script exists',    existsSync(join(skillRoot, 'scripts'
 
 // ── Host discovery ────────────────────────────────────────────────────────
 console.log('');
-const discovery = run(join(__dirname, 'discover.mjs'));
+const discovery = run(join(__dirname, 'discover.mjs'), [], process.env);
 if (discovery) {
   let anyHost = false;
   for (const [id, info] of Object.entries(discovery.agents ?? {})) {
@@ -122,11 +124,18 @@ if (discovery) {
   if (!anyHost) warn('No supported hosts detected');
 
   console.log('');
-  const ds = discovery.delegateSkills ?? { installed: false };
+  const ds = discovery.delegateSkills ?? { installed: false, skills: [], relays: [], lanes: {} };
   if (ds.installed) {
-    check(`delegate-skills detected (${Object.keys(ds.lanes ?? {}).length} lane(s))`, true);
+    const skillCount = (ds.skills ?? ds.relays ?? []).length;
+    const laneCount = Object.keys(ds.lanes ?? {}).length;
+    check(`delegate-skills detected (${skillCount} delegate skill(s), ${laneCount} lane(s))`, true);
   } else {
-    warn('delegate-skills not detected (optional)');
+    warn('delegate-skills not detected (optional — native execution active)');
+    if (configObj?.delegate?.lastInstallAttempt === 'failed') {
+      warn('Last delegate-skills install attempt failed (run "adaptive-director delegate install" to retry)');
+    } else if (configObj?.delegate?.lastInstallAttempt === 'unverified') {
+      warn('delegate-skills installation unverified: no relays detected');
+    }
   }
 } else {
   allGood &= check('Discovery script works', false, 'Check Node version or reinstall');

package/scripts/install.mjs

@@ -1,97 +1,97 @@
-#!/usr/bin/env node
-import { execFileSync } from 'node:child_process';
-import { mkdirSync, cpSync, rmSync, existsSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const projectRoot = join(__dirname, '..');
-
-const args = process.argv.slice(2);
-const targets = args.filter(a => !a.startsWith('-'));
-
-const canonicalSkillSource = join(projectRoot, 'skills', 'adaptive-director');
-
-/**
- * Copy Adaptive Director Skill files into a host skill directory.
- * Idempotent: removes old copy first, then copies fresh from skills/adaptive-director.
- */
-function installInto(hostSkillDir) {
-  const dest = join(hostSkillDir, 'adaptive-director');
-  console.log(`  Installing into ${dest}...`);
-  if (!existsSync(canonicalSkillSource)) {
-    console.error(`  Error: Canonical skill source not found at ${canonicalSkillSource}`);
-    process.exit(1);
-  }
-  // Remove legacy title-case folder if different and present
-  const legacyDest = join(hostSkillDir, 'Adaptive-Director');
-  if (legacyDest.toLowerCase() === dest.toLowerCase() && existsSync(legacyDest)) {
-    rmSync(legacyDest, { recursive: true, force: true });
-  } else if (existsSync(dest)) {
-    rmSync(dest, { recursive: true, force: true });
-  }
-  mkdirSync(dest, { recursive: true });
-  cpSync(canonicalSkillSource, dest, { recursive: true });
-  console.log(`  ✓ Installed successfully at ${dest}`);
-}
-
-// ─── If paths were passed as arguments, install into those directly ─────────
-if (targets.length > 0) {
-  for (const target of targets) {
-    installInto(target);
-  }
-  process.exit(0);
-}
-
-// ─── No args: auto-discover hosts and install ───────────────────────────────
-const discoverScript = join(__dirname, 'discover.mjs');
-
-function runDiscover() {
-  try {
-    const out = execFileSync(process.execPath, [discoverScript], {
-      encoding: 'utf8', timeout: 15000, cwd: process.cwd(),
-    });
-    return JSON.parse(out.trim());
-  } catch {
-    return null;
-  }
-}
-
-console.log('\n  Adaptive Director — Install\n');
-console.log('  Discovering hosts...\n');
-
-const discovery = runDiscover();
-if (!discovery) {
-  console.error('  Error: discovery failed.');
-  process.exit(1);
-}
-
-const hostsWithSkillDir = [];
-for (const [id, info] of Object.entries(discovery.agents ?? {})) {
-  if (info.installed && info.skillPath) {
-    hostsWithSkillDir.push({ id, path: info.skillPath });
-  } else if (info.installed) {
-    console.log(`  ! ${id}: installed but skill directory could not be resolved. Skipping.`);
-  }
-}
-
-if (hostsWithSkillDir.length === 0) {
-  console.log('  No known host skill directories found. Nothing to install.');
-  process.exit(0);
-}
-
-console.log('  Installing into detected hosts:');
-for (const h of hostsWithSkillDir) {
-  console.log(`  [→] ${h.id} — ${h.path}`);
-}
-console.log('');
-
-for (const h of hostsWithSkillDir) {
-  try {
-    installInto(h.path);
-  } catch (e) {
-    console.error(`  ✗ Failed to install for ${h.id}: ${e.message}`);
-  }
-}
-
-console.log('\n  Done. Run "adaptive-director doctor" to verify.\n');
+#!/usr/bin/env node
+import { execFileSync } from 'node:child_process';
+import { mkdirSync, cpSync, rmSync, existsSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const projectRoot = join(__dirname, '..');
+
+const args = process.argv.slice(2);
+const targets = args.filter(a => !a.startsWith('-'));
+
+const canonicalSkillSource = join(projectRoot, 'skills', 'adaptive-director');
+
+/**
+ * Copy Adaptive Director Skill files into a host skill directory.
+ * Idempotent: removes old copy first, then copies fresh from skills/adaptive-director.
+ */
+function installInto(hostSkillDir) {
+  const dest = join(hostSkillDir, 'adaptive-director');
+  console.log(`  Installing into ${dest}...`);
+  if (!existsSync(canonicalSkillSource)) {
+    console.error(`  Error: Canonical skill source not found at ${canonicalSkillSource}`);
+    process.exit(1);
+  }
+  // Remove legacy title-case folder if different and present
+  const legacyDest = join(hostSkillDir, 'Adaptive-Director');
+  if (legacyDest.toLowerCase() === dest.toLowerCase() && existsSync(legacyDest)) {
+    rmSync(legacyDest, { recursive: true, force: true });
+  } else if (existsSync(dest)) {
+    rmSync(dest, { recursive: true, force: true });
+  }
+  mkdirSync(dest, { recursive: true });
+  cpSync(canonicalSkillSource, dest, { recursive: true });
+  console.log(`  ✓ Installed successfully at ${dest}`);
+}
+
+// ─── If paths were passed as arguments, install into those directly ─────────
+if (targets.length > 0) {
+  for (const target of targets) {
+    installInto(target);
+  }
+  process.exit(0);
+}
+
+// ─── No args: auto-discover hosts and install ───────────────────────────────
+const discoverScript = join(__dirname, 'discover.mjs');
+
+function runDiscover() {
+  try {
+    const out = execFileSync(process.execPath, [discoverScript], {
+      encoding: 'utf8', timeout: 15000, cwd: process.cwd(),
+    });
+    return JSON.parse(out.trim());
+  } catch {
+    return null;
+  }
+}
+
+console.log('\n  Adaptive Director — Install\n');
+console.log('  Discovering hosts...\n');
+
+const discovery = runDiscover();
+if (!discovery) {
+  console.error('  Error: discovery failed.');
+  process.exit(1);
+}
+
+const hostsWithSkillDir = [];
+for (const [id, info] of Object.entries(discovery.agents ?? {})) {
+  if (info.installed && info.skillPath) {
+    hostsWithSkillDir.push({ id, path: info.skillPath });
+  } else if (info.installed) {
+    console.log(`  ! ${id}: installed but skill directory could not be resolved. Skipping.`);
+  }
+}
+
+if (hostsWithSkillDir.length === 0) {
+  console.log('  No known host skill directories found. Nothing to install.');
+  process.exit(0);
+}
+
+console.log('  Installing into detected hosts:');
+for (const h of hostsWithSkillDir) {
+  console.log(`  [→] ${h.id} — ${h.path}`);
+}
+console.log('');
+
+for (const h of hostsWithSkillDir) {
+  try {
+    installInto(h.path);
+  } catch (e) {
+    console.error(`  ✗ Failed to install for ${h.id}: ${e.message}`);
+  }
+}
+
+console.log('\n  Done. Run "adaptive-director doctor" to verify.\n');

package/scripts/refresh.mjs

@@ -7,11 +7,12 @@ import { fileURLToPath } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-function run(script, args = []) {
+function run(script, args = [], env = process.env) {
   try {
     const out = execFileSync(process.execPath, [script, ...args], {
       encoding: 'utf8', timeout: 15000,
       cwd: process.cwd(),
+      env,
     });
     return JSON.parse(out.trim());
   } catch (e) {
@@ -24,7 +25,7 @@ const configPath = join(configDir, 'config.json');
 
 console.log('Refreshing Adaptive Director config...\n');
 
-const discovery = run(join(__dirname, 'discover.mjs'));
+const discovery = run(join(__dirname, 'discover.mjs'), [], process.env);
 if (!discovery) {
   console.error('✗ Discovery failed.');
   process.exit(1);
@@ -39,11 +40,20 @@ if (existsSync(configPath)) {
   }
 }
 
+const delegateInstalled = Boolean(discovery.delegateSkills?.installed);
+const delegateEnabled = existingConfig.delegate?.enabled ?? existingConfig.delegateEnabled ?? false;
+
 const config = {
   version: 1,
+  execution: existingConfig.execution || 'native',
   defaultBudget: existingConfig.defaultBudget || 'balanced',
   allowMax: existingConfig.allowMax || false,
-  delegateEnabled: existingConfig.delegateEnabled || false,
+  delegateEnabled,
+  delegate: {
+    installed: delegateInstalled,
+    enabled: delegateEnabled,
+    ...(existingConfig.delegate?.lastInstallAttempt ? { lastInstallAttempt: existingConfig.delegate.lastInstallAttempt } : {})
+  },
   hosts: {},
   overrides: existingConfig.overrides || {}
 };
@@ -51,6 +61,7 @@ const config = {
 for (const [id, info] of Object.entries(discovery.agents ?? {})) {
   if (info.installed) {
     config.hosts[id] = {
+      ...existingConfig.hosts?.[id],
       enabled: existingConfig.hosts?.[id]?.enabled ?? true,
       skillPath: info.skillPath
     };