@hybridlabor-api/aos 4.7.2 → 4.9.0

package/installer.js

@@ -115,8 +115,8 @@ if (mcpsArgRaw && mcpsArg === null) {
 // not express that in a script or CI, and got Antigravity as their primary
 // target instead. Values match the menu: 0 universal, 1 Antigravity,
 // 2 Claude Desktop/Code, 3 Cursor, 4 custom, 5 Codex, 6 Windsurf, 7 Roo/Cline,
-// 8 Aider (9 = project harness has its own --project-harness flag).
-const VALID_PLATFORMS = ['0', '1', '2', '3', '4', '5', '6', '7', '8'];
+// 8 Aider, 10 AOS CLI (9 = project harness has its own --project-harness flag).
+const VALID_PLATFORMS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '10'];
 const platformsArgRaw = process.argv.find(a => a === '--platforms' || a.startsWith('--platforms='));
 let PLATFORMS_ARG = null;
 if (platformsArgRaw) {
@@ -1257,6 +1257,7 @@ function syncSkillsToGlobalHarnesses(excludeSkills = []) {
         { dir: path.join(homeDir, '.codex', 'skills'), key: 'codex' },
         { dir: path.join(homeDir, '.cursor', 'skills'), key: 'cursor' },
         { dir: path.join(homeDir, '.roo', 'skills'), key: 'vscode' },
+        { dir: process.platform === 'win32' ? path.join(process.env.APPDATA || homeDir, 'opencode', 'skills') : path.join(homeDir, '.config', 'opencode', 'skills'), key: 'opencode' },
     ].filter((d) => d.key === null || detectedKeys.has(d.key));
 
     for (const { dir: dest } of extraSkillDestinations) {
@@ -1709,7 +1710,12 @@ function checkModuleUpdate(pkgName, targetDir) {
         let remoteVer = null;
         let checkFailed = false;
         try {
-            remoteVer = execSync(`npm view ${pkgName} version`, { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8', timeout: 4000 }).trim();
+            const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+            if (process.platform === 'win32') {
+                remoteVer = execSync(`"${npmCmd}" view ${pkgName} version`, { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8', timeout: 4000 }).trim();
+            } else {
+                remoteVer = execFileSync(npmCmd, ['view', pkgName, 'version'], { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8', timeout: 4000 }).trim();
+            }
         } catch (e) {
             // Offline, a proxy, or a misconfigured registry. Swallowing this
             // made every module report "up to date" forever on such a machine,
@@ -1804,15 +1810,40 @@ function downloadOrUpdateModule(pkgName, targetDir, displayName) {
             }
         }
 
+        // Phase 1: retire the live tree. On Windows a running daemon holds open
+        // file handles into targetDir — retry with brief backoff before failing.
+        // ponytail: 3 retries × 600ms; escalate to process kill if this ceiling matters
+        let phase1Done = false;
+        for (let attempt = 0; attempt < 3 && !phase1Done; attempt++) {
+            try {
+                fs.renameSync(targetDir, retiredDir);
+                phase1Done = true;
+            } catch (retireError) {
+                const retriable = retireError.code === 'EPERM' || retireError.code === 'EBUSY';
+                if (retriable && attempt < 2) {
+                    const delayMs = 600 * (attempt + 1);
+                    try {
+                        if (process.platform === 'win32') {
+                            execSync(`powershell -NoProfile -Command "Start-Sleep -Milliseconds ${delayMs}"`, { stdio: 'ignore' });
+                        } else {
+                            execSync(`sleep ${delayMs / 1000}`, { stdio: 'ignore' });
+                        }
+                    } catch (_) {}
+                    continue;
+                }
+                safeRmDirSync(stagingDir);
+                throw retireError;
+            }
+        }
+
+        // Phase 2: promote the staging tree. stagingDir was just unpacked and
+        // has no open handles, so a single attempt is sufficient.
         try {
-            fs.renameSync(targetDir, retiredDir);
             fs.renameSync(stagingDir, targetDir);
-        } catch (swapError) {
-            if (fs.existsSync(retiredDir) && !fs.existsSync(targetDir)) {
-                try { fs.renameSync(retiredDir, targetDir); } catch (_) {}
-            }
+        } catch (promoteError) {
+            try { fs.renameSync(retiredDir, targetDir); } catch (_) {}
             safeRmDirSync(stagingDir);
-            throw swapError;
+            throw promoteError;
         }
 
         // On Windows especially, deleting a directory that was just renamed or contains
@@ -1885,6 +1916,21 @@ async function installMemB(interactive) {
         }));
     }
     const membDir = path.join(moduleBasePath(), 'memB');
+    // On Windows the memB WebUI process holds open file handles inside membDir.
+    // The atomic rename inside downloadOrUpdateModule fails with EPERM as long as
+    // those handles are live — retry backoff cannot help. Kill the process on
+    // port 8088 before attempting the download so the rename succeeds.
+    if (process.platform === 'win32') {
+        try {
+            execSync(
+                'powershell -NoProfile -Command "' +
+                'Get-NetTCPConnection -LocalPort 8088 -ErrorAction SilentlyContinue |' +
+                ' Select-Object -ExpandProperty OwningProcess |' +
+                ' ForEach-Object { Stop-Process -Id $_ -Force -ErrorAction SilentlyContinue }"',
+                { stdio: 'ignore' }
+            );
+        } catch (_) {}
+    }
     // A failed download used to fall through into venv setup and daemon
     // registration, each of which then failed on its own terms or, worse,
     // "succeeded" against a stale tree -- and the run still ended in a success
@@ -2050,13 +2096,23 @@ async function installSynapse() {
     }
 
     const isWin = process.platform === 'win32';
-    const binaryName = isWin ? 'synapse.js' : 'synapse';
-    let binaryPath = path.join(synapseDir, 'bin', binaryName);
-    if (!fs.existsSync(binaryPath)) {
-        if (process.platform === 'darwin' && fs.existsSync(path.join(synapseDir, 'bin', 'synapse-darwin-arm64'))) {
-            binaryPath = path.join(synapseDir, 'bin', 'synapse-darwin-arm64');
-        } else if (process.platform === 'linux' && fs.existsSync(path.join(synapseDir, 'bin', 'synapse-linux-amd64'))) {
-            binaryPath = path.join(synapseDir, 'bin', 'synapse-linux-amd64');
+    let binaryPath;
+    if (isWin) {
+        if (fs.existsSync(path.join(synapseDir, 'bin', 'synapse.exe'))) {
+            binaryPath = path.join(synapseDir, 'bin', 'synapse.exe');
+        } else if (fs.existsSync(path.join(synapseDir, 'bin', 'synapse-windows-amd64.exe'))) {
+            binaryPath = path.join(synapseDir, 'bin', 'synapse-windows-amd64.exe');
+        } else {
+            binaryPath = path.join(synapseDir, 'bin', 'synapse.js');
+        }
+    } else {
+        binaryPath = path.join(synapseDir, 'bin', 'synapse');
+        if (!fs.existsSync(binaryPath)) {
+            if (process.platform === 'darwin' && fs.existsSync(path.join(synapseDir, 'bin', 'synapse-darwin-arm64'))) {
+                binaryPath = path.join(synapseDir, 'bin', 'synapse-darwin-arm64');
+            } else if (process.platform === 'linux' && fs.existsSync(path.join(synapseDir, 'bin', 'synapse-linux-amd64'))) {
+                binaryPath = path.join(synapseDir, 'bin', 'synapse-linux-amd64');
+            }
         }
     }
 
@@ -2406,85 +2462,159 @@ async function installDevToolInstaller() {
     }
 }
 
-// AO ships one prebuilt binary: backend/ao-daemon, Mach-O arm64. The package
-// carries Windows and Linux sources but nothing built for them, and its CLI
-// shim picks the first candidate path that EXISTS without checking whether it
-// can run — so on any other platform it hands spawn a Mach-O file and fails
-// with an exec-format error instead of the "go build" hint it means to give.
-// Installing it there would be installing something known not to work.
+// AO is fully supported across macOS (arm64, amd64), Linux (amd64, arm64), and Windows (amd64).
 function aoSupportedHere() {
-    return process.platform === 'darwin' && process.arch === 'arm64';
+    return ['darwin', 'linux', 'win32'].includes(process.platform);
 }
 
 async function installOSAgentWorkspace() {
     if (!aoSupportedHere()) {
-        log.warn(`AO ships only a macOS arm64 binary — skipping on ${process.platform}/${process.arch}.`);
-        log.warn('Build it from source instead: github.com/hybridlabor-api/bdb-agent-orchestrator');
+        log.warn(`AO is not supported on ${process.platform}/${process.arch}.`);
         return;
     }
 
-    const osAgentDir = path.join(moduleBasePath(), 'bdb-agent-orchestrator');
-    if (!downloadOrUpdateModule('@hybridlabor-api/bdb-agent-orchestrator', osAgentDir, 'BDB Agent Orchestrator')) {
-        log.warn('Skipping AO setup: the module could not be downloaded.');
-        return;
+    const isWin = process.platform === 'win32';
+    const isMac = process.platform === 'darwin';
+    const isLinux = process.platform === 'linux';
+
+    // Discover AO directory: check local development checkouts first, then moduleBasePath
+    const candidateDirs = [
+        path.join(homeDir, 'dev', 'agents', 'bdb-agent-orchestrator'),
+        path.join(homeDir, 'dev', 'bdb-dev', 'bdb-agent-orchestrator'),
+        path.join(moduleBasePath(), 'bdb-agent-orchestrator')
+    ];
+    const osAgentDir = candidateDirs.find(d => fs.existsSync(d)) || candidateDirs[candidateDirs.length - 1];
+    const isLocalGitRepo = fs.existsSync(path.join(osAgentDir, '.git'));
+
+    if (isLocalGitRepo) {
+        log.step(`Using local development workspace for AO: ${osAgentDir}`);
+    } else {
+        if (!downloadOrUpdateModule('@hybridlabor-api/bdb-agent-orchestrator', osAgentDir, 'BDB Agent Orchestrator')) {
+            log.warn('Skipping AO setup: the module could not be downloaded.');
+            return;
+        }
     }
     if (DRY_RUN) {
-        log.step('[dry-run] would link ~/.local/bin/ao and run `ao service install`');
+        log.step('[dry-run] would link ao binary and run `ao service install`');
         return;
     }
 
-    const localBinDir = path.join(homeDir, '.local', 'bin');
-    const binTarget = path.join(localBinDir, 'ao');
-    const daemonBin = path.join(osAgentDir, 'backend', 'ao-daemon');
+    const localBinDir = isWin
+        ? path.join(process.env.LOCALAPPDATA || homeDir, 'Programs', 'ao')
+        : path.join(homeDir, '.local', 'bin');
+    const binTarget = path.join(localBinDir, isWin ? 'ao.exe' : 'ao');
+
+    // Platform-specific binary lookup
+    const candidateBinaries = [];
+    if (isWin) {
+        candidateBinaries.push(
+            path.join(osAgentDir, 'backend', 'bin', 'ao-windows-amd64.exe'),
+            path.join(osAgentDir, 'backend', 'bin', 'ao.exe'),
+            path.join(osAgentDir, 'backend', 'ao.exe')
+        );
+    } else if (isMac) {
+        if (process.arch === 'arm64') {
+            candidateBinaries.push(path.join(osAgentDir, 'backend', 'bin', 'ao-darwin-arm64'));
+        } else {
+            candidateBinaries.push(path.join(osAgentDir, 'backend', 'bin', 'ao-darwin-amd64'));
+        }
+        candidateBinaries.push(
+            path.join(osAgentDir, 'backend', 'ao-daemon'),
+            path.join(osAgentDir, 'backend', 'bin', 'ao'),
+            path.join(osAgentDir, 'backend', 'ao')
+        );
+    } else if (isLinux) {
+        if (process.arch === 'arm64') {
+            candidateBinaries.push(path.join(osAgentDir, 'backend', 'bin', 'ao-linux-arm64'));
+        } else {
+            candidateBinaries.push(path.join(osAgentDir, 'backend', 'bin', 'ao-linux-amd64'));
+        }
+        candidateBinaries.push(
+            path.join(osAgentDir, 'backend', 'ao-daemon'),
+            path.join(osAgentDir, 'backend', 'bin', 'ao'),
+            path.join(osAgentDir, 'backend', 'ao')
+        );
+    }
+    let daemonBin = candidateBinaries.find(p => fs.existsSync(p));
+
+    // Fallback: compile from Go source if Go is installed and binary is not pre-built
+    if (!daemonBin && hasExecutable('go') && fs.existsSync(path.join(osAgentDir, 'backend', 'cmd', 'ao'))) {
+        const s = spinner();
+        s.start('Compiling AO daemon binary from Go source...');
+        try {
+            const buildTarget = path.join(osAgentDir, 'backend', 'bin', isWin ? 'ao.exe' : 'ao');
+            fs.mkdirSync(path.dirname(buildTarget), { recursive: true });
+            execFileSync('go', ['build', '-ldflags=-s -w', '-o', buildTarget, './cmd/ao'], {
+                cwd: path.join(osAgentDir, 'backend'),
+                stdio: 'ignore'
+            });
+            daemonBin = buildTarget;
+            s.stop('Compiled AO daemon binary successfully.');
+        } catch (e) {
+            s.stop(`Failed to compile AO from source: ${e.message}`);
+        }
+    }
 
-    if (!fs.existsSync(daemonBin)) {
-        log.warn(`AO binary missing at ${daemonBin} — package layout changed?`);
+    // Fallback: if already installed and functional, keep it
+    if (!daemonBin && fs.existsSync(binTarget)) {
+        try {
+            execFileSync(binTarget, ['--version'], { stdio: 'ignore' });
+            log.step(`Keeping existing working AO binary at ${binTarget}`);
+            daemonBin = binTarget;
+        } catch (_) {}
+    }
+
+    if (!daemonBin) {
+        log.warn(`AO binary missing in ${osAgentDir} — package layout changed or Go build needed.`);
         return;
     }
 
-    installStep('place the ao binary', () => {
-        fs.mkdirSync(localBinDir, { recursive: true });
-        // copyFileSync preserves bytes, so the package's ad-hoc signature
-        // survives. That matters: an unsigned binary at this path is SIGKILLed
-        // by AMFI on launch (exit 137) and reads as a daemon that simply will
-        // not start, with nothing in the log to say why.
-        fs.copyFileSync(daemonBin, binTarget);
-        fs.chmodSync(binTarget, 0o755);
-        log.step(`Installed ao to ${binTarget}`);
-    }, 'AO cannot be started without its binary.');
+    if (daemonBin !== binTarget) {
+        installStep('place the ao binary', () => {
+            fs.mkdirSync(localBinDir, { recursive: true });
+            fs.copyFileSync(daemonBin, binTarget);
+            if (!isWin) {
+                fs.chmodSync(binTarget, 0o755);
+            }
+            log.step(`Installed ao to ${binTarget}`);
+        }, 'AO cannot be started without its binary.');
+    }
 
-    try {
-        execFileSync('codesign', ['-v', binTarget], { stdio: 'ignore' });
-    } catch {
-        log.warn('The ao binary is not code-signed — AMFI will kill it at launch.');
+    // macOS only: code-sign ad-hoc to prevent AMFI SIGKILL
+    if (isMac) {
         try {
-            execFileSync('codesign', ['-s', '-', '-f', binTarget], { stdio: 'ignore' });
-            log.step('Signed it ad-hoc.');
-        } catch (e) { log.warn(`Could not sign it: ${e.message}`); }
+            execFileSync('codesign', ['-v', binTarget], { stdio: 'ignore' });
+        } catch {
+            log.warn('The ao binary is not code-signed — AMFI will kill it at launch.');
+            try {
+                execFileSync('codesign', ['-s', '-', '-f', binTarget], { stdio: 'ignore' });
+                log.step('Signed it ad-hoc.');
+            } catch (e) { log.warn(`Could not sign it: ${e.message}`); }
+        }
     }
 
     // AO installs its own service, and does it for macOS, Windows and Linux.
-    // AOS used to hand-write a LaunchAgent instead, labelled
-    // com.bdb.agent-workspace, whose ProgramArguments were just the binary with
-    // NO subcommand -- so launchd started `ao`, which prints help and exits,
-    // and with KeepAlive kept restarting it. The daemon never ran, on any
-    // machine that installed AO through AOS. Delegating to the tool removes
-    // both the wrong label and the wrong arguments, and keeps working when the
-    // service definition changes upstream.
-    const legacyPlist = path.join(homeDir, 'Library', 'LaunchAgents', 'com.bdb.agent-workspace.plist');
-    if (fs.existsSync(legacyPlist)) {
-        try { execFileSync('launchctl', ['unload', legacyPlist], { stdio: 'ignore' }); } catch (e) { logDebug(e, 'unload legacy ao agent'); }
-        try { fs.unlinkSync(legacyPlist); log.step('Removed the old com.bdb.agent-workspace service.'); } catch (e) { logDebug(e, 'remove legacy plist'); }
+    if (isMac) {
+        const legacyPlist = path.join(homeDir, 'Library', 'LaunchAgents', 'com.bdb.agent-workspace.plist');
+        if (fs.existsSync(legacyPlist)) {
+            try { execFileSync('launchctl', ['unload', legacyPlist], { stdio: 'ignore' }); } catch (e) { logDebug(e, 'unload legacy ao agent'); }
+            try { fs.unlinkSync(legacyPlist); log.step('Removed the old com.bdb.agent-workspace service.'); } catch (e) { logDebug(e, 'remove legacy plist'); }
+        }
     }
 
     installStep('register the AO service', () => {
         execFileSync(binTarget, ['service', 'install'], { stdio: 'ignore' });
     }, 'Start it by hand with: ao service install');
 
-    if (await verifyDaemonListening(3101, 'AO Orchestrator', 8000)) {
+    // Windows startup entries fire asynchronously — give the service more time
+    const aoTimeout = process.platform === 'win32' ? 20000 : 8000;
+    if (await verifyDaemonListening(3101, 'AO Orchestrator', aoTimeout)) {
         log.success('AO Orchestrator running on http://localhost:3101');
     } else {
-        log.warn('AO did not answer on :3101 — check `ao service status` and `ao service logs`.');
+        const hint = process.platform === 'win32'
+            ? 'Run `ao service install` again or log out and back in, then check `ao service status`.'
+            : 'Check `ao service status` and `ao service logs`.';
+        log.warn(`AO did not answer on :3101 — ${hint}`);
     }
 }
 async function promptMemBIngestion(mcpCodeTarget) {
@@ -2534,7 +2664,7 @@ function verifyEcosystemInstallation() {
         { name: '1. bdb-synapse', pkg: '@hybridlabor-api/bdb-synapse', paths: [path.join(moduleBasePath(), 'bdb-synapse')] },
         { name: '2. memB', pkg: '@hybridlabor-api/memb', paths: [path.join(moduleBasePath(), 'memB'), path.join(geminiDir, 'config', 'mcps', 'memb-mcp')] },
         { name: '3. heimdall-token-saver', pkg: '@hybridlabor-api/heimdall-token-saver', paths: [path.join(moduleBasePath(), 'heimdall-token-saver'), path.join(srcDir, 'vendor', 'token-saver')] },
-        { name: '4. AO Agent Orchestrator', pkg: '@hybridlabor-api/bdb-agent-orchestrator', paths: [path.join(moduleBasePath(), 'bdb-agent-orchestrator')] },
+        { name: '4. AO Agent Orchestrator', pkg: '@hybridlabor-api/bdb-agent-orchestrator', paths: [path.join(homeDir, 'dev', 'agents', 'bdb-agent-orchestrator'), path.join(moduleBasePath(), 'bdb-agent-orchestrator')] },
         { name: '5. bdb-dev-creator-extension', pkg: '@hybridlabor-api/bdb-dev-creator-extension', paths: [path.join(moduleBasePath(), 'bdb-dev-creator-extension')] },
         { name: '6. bdb-hardware-pcb', pkg: '@hybridlabor-api/bdb-hardware-pcb', paths: [path.join(moduleBasePath(), 'bdb-hardware-pcb')] },
         { name: '7. bdb-os-remote', pkg: '@hybridlabor-api/bdb-os-remote', paths: [path.join(moduleBasePath(), 'bdb-os-remote')] },
@@ -2558,7 +2688,10 @@ function verifyEcosystemInstallation() {
                 let newerVersion = null;
                 let newerTag = null;
                 try {
-                    const distTagsJson = execSync(`npm view ${mod.pkg} dist-tags --json`, { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8', timeout: 4000 }).trim();
+                    const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+                    const distTagsJson = process.platform === 'win32'
+                        ? execSync(`"${npmCmd}" view ${mod.pkg} dist-tags --json`, { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8', timeout: 4000 }).trim()
+                        : execFileSync(npmCmd, ['view', mod.pkg, 'dist-tags', '--json'], { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8', timeout: 4000 }).trim();
                     const distTags = JSON.parse(distTagsJson);
                     for (const [tag, ver] of Object.entries(distTags)) {
                         if (isNewerVersion(localVer, ver)) {
@@ -2604,7 +2737,7 @@ function verifyEcosystemInstallation() {
 
     console.log('');
     console.log(`  ${colors.bold}━━━ BDB Agent OS Dashboard ━━━${colors.reset}`);
-    console.log(`  Interactive Control Center: npx aos-dashboard`);
+    console.log(`  Interactive Control Center: aos-dashboard`);
     console.log(`  ${colors.dim}(Live status & service control at http://127.0.0.1:7900)${colors.reset}`);
 }
 
@@ -3544,23 +3677,23 @@ function injectHarnessRules() {
 // that adds or changes a hook silently never received it -- which is exactly
 // what happened to memb-inject.mjs in v4.4.0, on the machines that needed it
 // most (a fresh install got it; every machine that already had AOS did not).
-function installGlobalHooks() {
+function installGlobalHooks({ targetHome = homeDir, targetGemini = geminiDir } = {}) {
     const hooksSrc = path.join(srcDir, '.claude', 'hooks');
     const workflowsSrc = path.join(srcDir, '.claude', 'workflows');
 
     // 1. Claude Code
     if (fs.existsSync(hooksSrc)) {
-        copyDirRecursiveSync(hooksSrc, path.join(homeDir, '.claude', 'hooks'));
-        log.step(`Installed hooks to ${path.join(homeDir, '.claude', 'hooks')}`);
+        copyDirRecursiveSync(hooksSrc, path.join(targetHome, '.claude', 'hooks'));
+        log.step(`Installed hooks to ${path.join(targetHome, '.claude', 'hooks')}`);
     }
     if (fs.existsSync(workflowsSrc)) {
-        copyDirRecursiveSync(workflowsSrc, path.join(homeDir, '.claude', 'workflows'));
+        copyDirRecursiveSync(workflowsSrc, path.join(targetHome, '.claude', 'workflows'));
     }
-    mergeBdbSettingsHooks(path.join(homeDir, '.claude', 'settings.json'));
+    mergeBdbSettingsHooks(path.join(targetHome, '.claude', 'settings.json'));
 
     // 2. Google Antigravity
-    const agyHooksDir = path.join(geminiDir, 'config', 'hooks');
-    const agyWorkflowsDir = path.join(geminiDir, 'config', 'workflows');
+    const agyHooksDir = path.join(targetGemini, 'config', 'hooks');
+    const agyWorkflowsDir = path.join(targetGemini, 'config', 'workflows');
     if (fs.existsSync(hooksSrc)) {
         copyDirRecursiveSync(hooksSrc, agyHooksDir);
         log.step(`Installed hooks to ${agyHooksDir}`);
@@ -3568,14 +3701,24 @@ function installGlobalHooks() {
     if (fs.existsSync(workflowsSrc)) {
         copyDirRecursiveSync(workflowsSrc, agyWorkflowsDir);
     }
-    mergeAntigravityHooks(path.join(geminiDir, 'config', 'hooks.json'));
-    if (fs.existsSync(path.join(geminiDir, 'antigravity-cli'))) {
-        mergeAntigravityHooks(path.join(geminiDir, 'antigravity-cli', 'hooks.json'));
+    mergeAntigravityHooks(path.join(targetGemini, 'config', 'hooks.json'));
+    const agyCliDir = path.join(targetGemini, 'antigravity-cli');
+    if (fs.existsSync(agyCliDir)) {
+        const agyCliHooksDir = path.join(agyCliDir, 'hooks');
+        const agyCliWorkflowsDir = path.join(agyCliDir, 'workflows');
+        if (fs.existsSync(hooksSrc)) {
+            copyDirRecursiveSync(hooksSrc, agyCliHooksDir);
+            log.step(`Installed hooks to ${agyCliHooksDir}`);
+        }
+        if (fs.existsSync(workflowsSrc)) {
+            copyDirRecursiveSync(workflowsSrc, agyCliWorkflowsDir);
+        }
+        mergeAntigravityHooks(path.join(agyCliDir, 'hooks.json'));
     }
 
     // 3. OpenAI Codex CLI
-    const codexHooksDir = path.join(homeDir, '.codex', 'hooks');
-    const codexWorkflowsDir = path.join(homeDir, '.codex', 'workflows');
+    const codexHooksDir = path.join(targetHome, '.codex', 'hooks');
+    const codexWorkflowsDir = path.join(targetHome, '.codex', 'workflows');
     if (fs.existsSync(hooksSrc)) {
         copyDirRecursiveSync(hooksSrc, codexHooksDir);
         log.step(`Installed hooks to ${codexHooksDir}`);
@@ -3583,12 +3726,12 @@ function installGlobalHooks() {
     if (fs.existsSync(workflowsSrc)) {
         copyDirRecursiveSync(workflowsSrc, codexWorkflowsDir);
     }
-    mergeCodexTomlHooks(path.join(homeDir, '.codex', 'config.toml'));
+    mergeCodexTomlHooks(path.join(targetHome, '.codex', 'config.toml'));
 
     // 4. OpenCode CLI
     const opencodeDir = process.platform === 'win32'
-        ? path.join(process.env.APPDATA || homeDir, 'opencode')
-        : path.join(homeDir, '.config', 'opencode');
+        ? path.join(process.env.APPDATA || targetHome, 'opencode')
+        : path.join(targetHome, '.config', 'opencode');
     const opencodePluginSrc = path.join(srcDir, '.opencode', 'plugins', 'bdb-aos.js');
     if (fs.existsSync(opencodePluginSrc)) {
         const opencodePluginsDir = path.join(opencodeDir, 'plugins');
@@ -3664,7 +3807,7 @@ function installGlobalBinaries() {
 // merged result goes to a .bdb-new.json sidecar -- the same recovery pattern
 // the MCP config merge in installMcpsForTarget uses.
 function mergeBdbSettingsHooks(settingsPath, { projectLocal = false } = {}) {
-    const bdbHookScripts = ['go-gate.mjs', 'graph-gate.mjs', 'memb-inject.mjs', 'trail-relay.mjs'];
+    const bdbHookScripts = ['go-gate.mjs', 'graph-gate.mjs', 'memb-inject.mjs', 'trail-relay.mjs', 'conventional-commits.mjs', 'env-file-protection.mjs'];
     // memb-inject reads the machine-global memB store under $HOME and is
     // installed once per machine, so it stays $HOME-anchored even inside a
     // project harness -- unlike the two gate hooks, which are per-checkout by
@@ -3736,7 +3879,7 @@ function mergeBdbSettingsHooks(settingsPath, { projectLocal = false } = {}) {
 // Merge the BDB hooks into Google Antigravity's hooks.json (.agents/hooks.json or
 // ~/.gemini/config/hooks.json), preserving user-defined foreign hooks.
 function mergeAntigravityHooks(hooksPath, { projectLocal = false } = {}) {
-    const bdbHookScripts = ['go-gate.mjs', 'graph-gate.mjs', 'memb-inject.mjs', 'startcycle-dispatch.mjs', 'trail-relay.mjs'];
+    const bdbHookScripts = ['go-gate.mjs', 'graph-gate.mjs', 'memb-inject.mjs', 'startcycle-dispatch.mjs', 'trail-relay.mjs', 'conventional-commits.mjs', 'env-file-protection.mjs'];
     const isBdbEntry = (entry) => {
         const cmds = (entry && Array.isArray(entry.hooks) ? entry.hooks : [entry])
             .map((h) => (h && typeof h.command === 'string' ? h.command : (typeof h === 'string' ? h : '')))
@@ -3753,7 +3896,14 @@ function mergeAntigravityHooks(hooksPath, { projectLocal = false } = {}) {
         PreToolUse: [
             {
                 matcher: "run_command|Bash",
-                hooks: [{ type: "command", command: `node "${path.join(hooksDir, 'go-gate.mjs')}"`, timeout: 10000 }]
+                hooks: [
+                    { type: "command", command: `node "${path.join(hooksDir, 'go-gate.mjs')}"`, timeout: 10000 },
+                    { type: "command", command: `node "${path.join(hooksDir, 'conventional-commits.mjs')}"`, timeout: 10000 }
+                ]
+            },
+            {
+                matcher: "write_file|edit_file|replace|Write|Edit|MultiEdit",
+                hooks: [{ type: "command", command: `node "${path.join(hooksDir, 'env-file-protection.mjs')}"`, timeout: 10000 }]
             },
             {
                 hooks: [{ type: "command", command: `node "${path.join(globalHooksDir, 'trail-relay.mjs')}" --agent agy --event PreToolUse`, timeout: 2000 }]
@@ -4775,18 +4925,24 @@ async function runQuickUpdate(installState) {
         injectHarnessRules();
     }, 'Harness files keep whatever version this machine already had.');
 
-    // OpenWiki setup only ever ran on a brand-new install (main()'s fresh-install
-    // branch below) -- an existing install running Quick Update never got offered
-    // it and never had its daemon schedule refreshed. promptCredentials() already
-    // detects an existing key and collapses to a single "keep existing" prompt in
-    // that case, so this is a no-op confirm for anyone already configured and a
-    // real one-time offer for anyone who isn't (including installs from before
-    // this feature existed).
+    // OpenWiki: if already configured, refresh the daemon silently (no prompt).
+    // Only ask when there is no key yet — i.e. a first-time offer or a machine
+    // that predates this feature. This avoids the "keep existing?" confirmation
+    // on every Quick Update for users who have already set up OpenWiki.
     if (!isAutoYes) {
-        const creds = await promptCredentials(paths.targetMcpDir);
-        if (creds !== BACK) {
-            await installOpenWikiDaemon(creds.gemini, paths.targetSkillDir, { provider: creds.openwikiProvider, model: creds.openwikiModel, baseUrl: creds.openwikiBaseUrl });
+        const _owEnv = loadExistingEnv(paths.targetMcpDir);
+        const _owProvider = _owEnv['OPENWIKI_PROVIDER'] || 'google';
+        const _owKeyName = PROVIDER_KEY_ENV_NAMES[_owProvider] || 'GEMINI_API_KEY';
+        const _owKey = _owEnv[_owKeyName] || _owEnv['GEMINI_API_KEY'] || _owEnv['GOOGLE_API_KEY'] || _owEnv['OPENWIKI_API_KEY'] || '';
+        if (_owKey || _owProvider === 'ollama') {
+            await installOpenWikiDaemon(_owKey, paths.targetSkillDir, { provider: _owProvider, model: _owEnv['OPENWIKI_MODEL'] || '', baseUrl: _owEnv['OPENWIKI_BASE_URL'] || '' });
             await installOpenWikiVisualizer();
+        } else {
+            const creds = await promptCredentials(paths.targetMcpDir);
+            if (creds !== BACK) {
+                await installOpenWikiDaemon(creds.gemini, paths.targetSkillDir, { provider: creds.openwikiProvider, model: creds.openwikiModel, baseUrl: creds.openwikiBaseUrl });
+                await installOpenWikiVisualizer();
+            }
         }
     }
 
@@ -4795,8 +4951,7 @@ async function runQuickUpdate(installState) {
         if (subId === 'synapse') await installSynapse();
         else if (subId === 'memb') await installMemB(false);
         else if (subId === 'remote') await installOSRemoteGateway();
-        // 'ao' intentionally skipped here even for
-        // existing installs -- see promptOptionalModules() for why.
+        else if (subId === 'ao' && aoSupportedHere()) await installOSAgentWorkspace();
         else if (subId === 'creator') await installCreatorExtension();
         else if (subId === 'hardware') await installHardwarePcb();
         else if (subId === 'installer') await installDevToolInstaller();
@@ -4840,6 +4995,40 @@ function buildAoAnnouncementBanner() {
     ].join('\n');
 }
 
+// AOS CLI ships as a separate npm package under packages/ for one reason: pi
+// updates on its own cadence, and folding it into this release cycle would turn
+// every pi bump into a full AOS reinstall. So it installs as an ordinary global
+// package and pulls pi in as its own dependency -- and it writes nothing to
+// ~/.agents, because it reads that directory rather than owning it.
+function installAosCli() {
+    const pkgDir = path.join(srcDir, 'packages', 'aos-cli');
+    const manual = 'cd packages/aos-cli && npm install -g .';
+
+    if (!fs.existsSync(path.join(pkgDir, 'package.json'))) {
+        log.warn(`AOS CLI package missing at ${pkgDir} -- skipped. Install it later: ${manual}`);
+        return;
+    }
+    if (hasExecutable('aos-cli')) {
+        log.step('aos-cli is already on PATH.');
+        return;
+    }
+    if (DRY_RUN) {
+        log.step('[dry-run] would run: npm install -g <packages/aos-cli>');
+        return;
+    }
+
+    const res = installStep('install AOS CLI', () => {
+        log.step('Installing AOS CLI globally (pi is installed as its dependency)...');
+        execSync(`npm install -g ${JSON.stringify(pkgDir)}`, { stdio: 'ignore' });
+    }, `The rest of AOS is installed. Install AOS CLI later: ${manual}`);
+
+    if (res.ok && hasExecutable('aos-cli')) {
+        log.success('AOS CLI installed -- run `aos-cli`.');
+    } else if (res.ok) {
+        log.warn('AOS CLI is installed but `aos-cli` is not on PATH. launchd and some Windows shells start with a PATH that omits npm\'s global bin.');
+    }
+}
+
 async function main() {
     if (process.argv[2] === 'store') {
         const storeScript = path.join(srcDir, 'bin', 'aos-store.mjs');
@@ -4981,6 +5170,7 @@ async function main() {
         { value: '7', label: 'Roo Code / Cline / VS Code', hint: '~/.roo' },
         { value: '8', label: 'Aider CLI', hint: '~/.aider' },
         { value: '9', label: '📁 Local Project Harness', hint: 'copy dispatcher contract to current project' },
+        { value: '10', label: '🖥️ AOS CLI', hint: 'pi harness -- reads ~/.agents, no own skill copy' },
         { value: '4', label: '⚙️ Custom Installation', hint: 'specify paths manually' }
     ];
 
@@ -5010,7 +5200,7 @@ async function main() {
         selectedMcps = await promptMcpSelection(tier);
     } else {
         const ctx = { tier: '1', selectedPlatforms: ['0'], mode: 'merge', customPaths: null, creds: null, selectedMcps: null };
-        const platformNames = { '0': '🌐 Universal Harness', '1': 'Google Antigravity', '2': 'Claude Desktop/Code', '3': 'Cursor/Generic IDE', '4': 'Custom Paths', '5': 'ChatGPT Codex CLI', '6': 'Windsurf', '7': 'Roo Code / Cline / VS Code', '8': 'Aider CLI', '9': 'Local Project Harness' };
+        const platformNames = { '0': '🌐 Universal Harness', '1': 'Google Antigravity', '2': 'Claude Desktop/Code', '3': 'Cursor/Generic IDE', '4': 'Custom Paths', '5': 'ChatGPT Codex CLI', '6': 'Windsurf', '7': 'Roo Code / Cline / VS Code', '8': 'Aider CLI', '9': 'Local Project Harness', '10': 'AOS CLI' };
 
         const stepTier = async () => {
             const t = await selectWithBack({
@@ -5176,7 +5366,22 @@ async function main() {
         fs.mkdirSync(backupDir, { recursive: true, mode: 0o700 });
     }, 'The installation continues, but existing files are not backed up.');
 
-    const targets = specificPlatforms.map(p => ({
+    // '10' is an action, not a directory target. AOS CLI reads
+    // ~/.agents/skills, which syncSkillsToGlobalHarnesses() already writes --
+    // left in this list it would fall through resolveTargetPaths()'s universal
+    // defaults and install a second full copy of every skill somewhere nobody
+    // reads them from.
+    const aosCliRequested = specificPlatforms.includes('10');
+    const dirPlatforms = specificPlatforms.filter(p => p !== '10');
+
+    if (aosCliRequested && dirPlatforms.length === 0) {
+        // AOS CLI alone would have no skills to load, and an empty target list
+        // leaves primaryTarget undefined for everything downstream of it.
+        log.warn('AOS CLI was the only target -- adding the universal skill target so it has something to load.');
+        dirPlatforms.push('1');
+    }
+
+    const targets = dirPlatforms.map(p => ({
         value: p,
         ...resolveTargetPaths(p, customPaths)
     }));
@@ -5263,10 +5468,13 @@ async function main() {
     // Flush file-level install manifest after all writes are done.
     flushSessionManifest();
 
+    // After the skill sync, because AOS CLI is useless without ~/.agents.
+    if (aosCliRequested) installAosCli();
+
     console.log('');
     verifyEcosystemInstallation();
 
-    outro(`🎉 Installation complete! Targets: ${targets.map(t => t.value).join(', ')} · Tier: ${tier === '1' ? 'Pro MEDIA' : 'Basic'}${DRY_RUN ? ' · DRY-RUN (nothing was modified)' : ''}`);
+    outro(`🎉 Installation complete! Targets: ${targets.map(t => t.value).join(', ')}${aosCliRequested ? ' + AOS CLI' : ''} · Tier: ${tier === '1' ? 'Pro MEDIA' : 'Basic'}${DRY_RUN ? ' · DRY-RUN (nothing was modified)' : ''}`);
 }
 
 if (require.main === module) {