@hybridlabor-api/aos 4.17.0 → 4.18.0

package/installer.js

@@ -24,6 +24,7 @@ const readline = require('readline');
 const util = require('util');
 const crypto = require('crypto');
 const pluginMigration = require('./lib/plugin-migration');
+const { pruneRetiredSkills } = require('./lib/retired-skills');
 
 function verifyDaemonListening(port, name, timeoutMs = 4000) {
     return new Promise((resolve) => {
@@ -683,25 +684,6 @@ function initSessionManifest(existingManifest, sourceDirs) {
     _sessionHashes = buildKnownSourceHashes(sourceDirs);
 }
 
-// Skills that left the package in 4.4.2 (Plan 02: migrated to the private
-// aos-internal repo, per ~/dev/_plans/aos-2026-09-14/), by their flattened
-// directory name at a sync destination.
-//
-// This is deliberately a fixed list, not a diff against what the current
-// payload ships. A generic "anything on disk that is not in skills/ right
-// now" pass was tried first and swept up two unrelated things: skill folders
-// that MCP servers bundle inside their own package tree (e.g.
-// mcps/tdmcp/.agents/skills/...), which happen to share the literal path
-// segment "skills" but belong to a different install entirely; and skills
-// under skills/workspace_agents/, which syncSkillsToGlobalHarnesses already
-// deliberately excludes from the six global destinations, so a stray global
-// copy of one says nothing about whether it is safe to delete. Both are real
-// cleanup opportunities, but they are a separate investigation, not a side
-// effect of this migration's beta test.
-const SKILLS_REMOVED_IN_4_4_2 = new Set([
-    'bdbsaastraining', 'bdb-dev-os-skill', 'bdbsaashost', 'bdb-ecosystem-health', 'bdbsaas-ops',
-]);
-
 // The exact roots syncSkillsToGlobalHarnesses and the Gemini/Antigravity
 // config-skills path write into. Pruning only touches a manifest entry whose
 // path starts under one of these -- never one that merely contains a
@@ -718,51 +700,16 @@ function globalSkillDestRoots() {
     ];
 }
 
-// syncSkillsToGlobalHarnesses (and its sibling copy loops) only ever add or
-// update -- nothing in that path ever deletes a skill that the current
-// payload no longer ships. That is fine for new skills and updated ones, but
-// it means a skill removed from a release stays on every user's disk
-// forever, through every future update, because nothing after the removal
-// ever looks at what is on disk that no longer has a source. This walks the
-// install manifest -- which already has one entry per file this installer
-// has ever placed -- for the specific skills 4.4.2 removed, under the six
-// known global skill roots, and deletes them. A user-modified file is backed
-// up first, the same way resolveFileConflict backs up a user edit it is
-// about to overwrite, rather than silently deleting local changes.
+// Retires skills the package no longer ships (lib/retired-skills.js). Edited or foreign files are
+// copied to the backup dir before the skill folder is removed.
 function pruneRemovedSkills(manifest) {
-    if (!manifest) return;
-    const roots = globalSkillDestRoots();
-
-    const staleDirs = new Set();
-    let removedFiles = 0;
-    for (const targetPath of Object.keys(manifest)) {
-        const root = roots.find((r) => targetPath.startsWith(r + path.sep));
-        if (!root) continue;
-        const skillDirName = targetPath.slice(root.length + 1).split(path.sep)[0];
-        if (!SKILLS_REMOVED_IN_4_4_2.has(skillDirName)) continue;
-
-        if (fs.existsSync(targetPath)) {
-            const diskHash = computeFileHash(targetPath);
-            const manifestEntry = manifest[targetPath];
-            if (diskHash !== null && manifestEntry && diskHash !== manifestEntry.sha256) {
-                const bakPath = `${targetPath}.${timestamp}.bak`;
-                try { fs.copyFileSync(targetPath, bakPath); } catch (e) { logDebug(e, 'prune-removed-skill backup'); }
-                log.warn(`[manifest] Retired skill left a user-edited file, backed up to ${bakPath} instead of deleting it.`);
-            } else {
-                try { fs.unlinkSync(targetPath); removedFiles++; } catch (e) { logDebug(e, 'prune-removed-skill unlink'); }
-            }
-            staleDirs.add(path.join(root, skillDirName));
-        }
-        delete manifest[targetPath];
-    }
-
-    for (const dir of staleDirs) {
-        try { fs.rmSync(dir, { recursive: true, force: true }); } catch (e) { logDebug(e, 'prune-removed-skill rmdir'); }
-    }
-
-    if (staleDirs.size > 0) {
-        log.step(`Removed ${removedFiles} file(s) from ${staleDirs.size} retired skill install(s) no longer shipped.`);
-    }
+    pruneRetiredSkills({
+        home: homeDir,
+        manifest,
+        roots: globalSkillDestRoots(),
+        backupDir: path.join(homeDir, '.agents', 'backups', `retired-skills-${timestamp}`),
+        log,
+    });
 }
 
 function flushSessionManifest() {
@@ -4015,12 +3962,68 @@ const OPENCODE_LOOP_SHELL_WARNING = 'opencode-loop: /loop-shell style commands r
     'tool.execute.before, and so the AOS go-gate, may never see them (unverified). ' +
     'Do not schedule git push, publish or other gated commands through them.';
 
+let codenotchResult = null;
+async function maybeInstallCodenotch() {
+    if (process.platform !== 'darwin' && process.platform !== 'win32') return;
+    const codenotch = require('./lib/codenotch.js');
+    codenotchResult = await codenotch.runCodenotchStep({
+        interactive: !isAutoYes,
+        dryRun: DRY_RUN,
+        ask: async (message, initialValue = true) => { const a = await askConfirm({ message, initialValue }); return !isCancel(a) && !!a; },
+        log: { info: (m) => log.info(m), warn: (m) => log.warn(m), success: (m) => log.success(m) },
+    });
+    const line = codenotch.codenotchSummaryLine(codenotchResult);
+    if (line) (codenotchResult.status === 'error' || /FAILED/.test(line) ? log.warn : log.info)(line);
+}
+
 function parseOpencodeOptional(argv = process.argv, env = process.env) {
     const flag = argv.find((a) => a.startsWith('--opencode-optional='));
     const raw = [env.AOS_OPENCODE_OPTIONAL, flag && flag.slice('--opencode-optional='.length)].filter(Boolean).join(',');
     return new Set(raw.split(',').map((x) => x.trim().toLowerCase()).filter(Boolean));
 }
 
+// Opt-in OpenCode permission. Off unless AOS_OPENCODE_PERMISSION=external_directory or
+// --opencode-permission=external_directory. Only permission.external_directory is ever set,
+// as path patterns (object form verified in the OpenCode config schema; ~ expands per its docs).
+const OPENCODE_EXTERNAL_DIRECTORY_RULES = { '~/.agents/**': 'allow', '~/.config/opencode/**': 'allow' };
+
+function parseOpencodePermission(argv = process.argv, env = process.env) {
+    const flag = argv.find((a) => a.startsWith('--opencode-permission='));
+    const raw = [env.AOS_OPENCODE_PERMISSION, flag && flag.slice('--opencode-permission='.length)].filter(Boolean).join(',');
+    return new Set(raw.split(',').map((x) => x.trim().toLowerCase()).filter(Boolean));
+}
+
+function applyOpencodePermission(data, configPath, wanted) {
+    for (const name of wanted) {
+        if (name !== 'external_directory') log.warn(`Unknown OpenCode permission "${name}" ignored.`);
+    }
+    if (!wanted.has('external_directory') || DRY_RUN) return;
+    const perm = data.permission;
+    if (perm !== undefined && (perm === null || typeof perm !== 'object' || Array.isArray(perm))) {
+        log.warn('opencode.jsonc "permission" is not an object (string shorthand?); external_directory not set, left untouched.');
+        return;
+    }
+    if (perm && 'external_directory' in perm) {
+        if (JSON.stringify(perm.external_directory) !== JSON.stringify(OPENCODE_EXTERNAL_DIRECTORY_RULES)) {
+            log.message('opencode.jsonc already has permission.external_directory; left untouched.');
+        }
+        return;
+    }
+    if (configPath && fs.existsSync(configPath)) {
+        if (readJsoncFile(configPath) === null) {
+            log.warn(`Could not parse ${configPath}; permission.external_directory not set.`);
+            return;
+        }
+        const bak = `${configPath}.${timestamp}.bak`;
+        try { fs.copyFileSync(configPath, bak); } catch (e) {
+            log.warn(`Could not back up ${configPath}, skipping permission.external_directory: ${e.message}`);
+            return;
+        }
+    }
+    data.permission = Object.assign(perm || {}, { external_directory: { ...OPENCODE_EXTERNAL_DIRECTORY_RULES } });
+    log.step('Added opt-in OpenCode permission.external_directory for AOS paths (comments in opencode.jsonc are not preserved on rewrite)');
+}
+
 const pluginPackageName = (entry) => {
     const str = typeof entry === 'string' ? entry : (Array.isArray(entry) ? String(entry[0]) : '');
     return str.replace(/(?<=.)@[^@/]*$/, '');
@@ -4108,7 +4111,7 @@ function installOpencodeCommands(srcDirPath, destDirPath) {
 // Sync merges MCP servers in the same pass and writes once). When `data` is
 // omitted the function loads and saves the config itself, which is what lets the
 // Quick Update path register the plugin as well as copy it.
-function installOpencodePlugin({ targetHome = homeDir, configPath = null, data = null, optional = parseOpencodeOptional() } = {}) {
+function installOpencodePlugin({ targetHome = homeDir, configPath = null, data = null, optional = parseOpencodeOptional(), permission = parseOpencodePermission() } = {}) {
     const opencodeDir = configPath
         ? path.dirname(configPath)
         : (process.platform === 'win32'
@@ -4195,6 +4198,8 @@ function installOpencodePlugin({ targetHome = homeDir, configPath = null, data =
         }
     }
 
+    applyOpencodePermission(data, configPath, permission instanceof Set ? permission : new Set(permission || []));
+
     if (ownsWrite) {
         // Write only on a real change. readJsoncFile strips comments, so
         // serialising an unchanged config would silently eat a user's comments
@@ -4284,6 +4289,26 @@ function installGlobalHooks({ targetHome = homeDir, targetGemini = geminiDir } =
 
     // 5. Global CLI launcher binaries (aos-config, aos-dashboard, aos-uninstall)
     installGlobalBinaries();
+
+    // 6. Fixed-path GO check for AO and other non-hook callers
+    installGoCheck({ targetHome });
+}
+
+// go-check.mjs is the fixed-path GO check for callers that are not a harness hook (AO).
+// It imports go-gate.mjs from its own directory, so both land in ~/.aos/bin, together with
+// the guarded patterns as JSON. Same conflict/backup rules as every other installed file.
+function installGoCheck({ targetHome = homeDir } = {}) {
+    const dest = path.join(targetHome, '.aos', 'bin');
+    const files = [
+        [path.join(srcDir, 'bin', 'go-check.mjs'), 'go-check.mjs'],
+        [path.join(srcDir, '.claude', 'hooks', 'go-gate.mjs'), 'go-gate.mjs'],
+        [path.join(srcDir, 'bin', 'guarded-patterns.json'), 'guarded-patterns.json'],
+    ];
+    if (!files.every(([src]) => fs.existsSync(src))) return false;
+    fs.mkdirSync(dest, { recursive: true });
+    for (const [src, name] of files) copyDirRecursiveSync(src, path.join(dest, name));
+    log.step(`Installed go-check to ${dest}`);
+    return true;
 }
 
 function installGlobalBinaries() {
@@ -4620,6 +4645,21 @@ function mergeCodexTomlMcpServers(configTomlPath, servers) {
     return skipped;
 }
 
+// The go-gate PreToolUse stanza for Codex's config.toml. Whether it fires under `codex exec`
+// or under aos-acp is UNVERIFIED (docs/codex-gate-smoke.md).
+function codexGateSnippet(hooksDir) {
+    return [
+        '[[hooks.PreToolUse]]',
+        'matcher = "^(Bash|run_command)$"',
+        '[[hooks.PreToolUse.hooks]]',
+        'type = "command"',
+        `command = ${JSON.stringify(`node "${path.join(hooksDir, 'go-gate.mjs')}"`)}`,
+        'timeout = 30',
+    ].join('\n');
+}
+
+const CODEX_GATE_NOTICE = 'Codex asks you to trust new or changed hooks before it runs them; approve the go-gate hook in Codex, or it stays inactive. Firing under `codex exec` and under aos-acp is UNVERIFIED: run the smoke test in docs/codex-gate-smoke.md.';
+
 // Merge the BDB hooks into ChatGPT Codex CLI's config.toml (~/.codex/config.toml or
 // .codex/config.toml), ensuring [features] hooks = true and preserving existing
 // non-BDB settings, comments, and MCP servers.
@@ -4631,12 +4671,7 @@ function mergeCodexTomlHooks(configTomlPath, { projectLocal = false } = {}) {
 
     const tomlSnippet = [
         '# AOS:HOOKS:START',
-        '[[hooks.PreToolUse]]',
-        'matcher = "^(Bash|run_command)$"',
-        '[[hooks.PreToolUse.hooks]]',
-        'type = "command"',
-        `command = ${JSON.stringify(`node "${path.join(hooksDir, 'go-gate.mjs')}"`)}`,
-        'timeout = 30',
+        codexGateSnippet(hooksDir),
         '',
         '[[hooks.Stop]]',
         '[[hooks.Stop.hooks]]',
@@ -5770,6 +5805,7 @@ async function runQuickUpdate(installState) {
 
     console.log('');
     verifyEcosystemInstallation();
+    await maybeInstallCodenotch();
     // Fresh installs open this via universalHarnessSync(); Quick Update never
     // did, so a dev-workflow machine only ever saw it once, on day one --
     // every subsequent run is a Quick Update, which is what almost every
@@ -5852,6 +5888,10 @@ async function main() {
         console.log(pkg.version);
         return;
     }
+    if (args.includes('--codex-gate')) {
+        console.log(`${codexGateSnippet(path.join(homeDir, '.codex', 'hooks'))}\n\n${CODEX_GATE_NOTICE}`);
+        return;
+    }
     if (args.includes('--help') || args.includes('-h') || args[0] === 'help') {
         console.log(`Usage: aos [command] [options]
 
@@ -5860,6 +5900,8 @@ Commands:
   doctor|checkup   Check the installation
 
 Options:
+  --codex-gate     Print the go-gate [[hooks.PreToolUse]] stanza for ~/.codex/config.toml
+                   and the Codex hook-trust note, then exit (writes nothing)
   -y, --yes        Non-interactive install (implied without a TTY)
   --dry-run        Show what would change
   --opencode-optional=LIST
@@ -5867,6 +5909,18 @@ Options:
                    AOS_OPENCODE_OPTIONAL. Pinned plugin[] entries are appended after a
                    config backup; rtk only prints a brew hint. Off by default. AOS never
                    runs foreign installers and never touches OpenCode's mcp set.
+  --no-codenotch   macOS and Windows only (never Linux): BDB AO Codenotch (desktop app,
+                   from hybridlabor-api/bdb-ao-codenotch) installs by default;
+                   skip it with this flag or AOS_CODENOTCH=0. --codenotch or
+                   AOS_CODENOTCH=1 forces it. Interactive prompt defaults to yes. Failures
+                   only warn and never fail the install. SHA-256 verified; Windows runs
+                   the per-user installer silently (/S, no admin). Never overwrites an app
+                   AOS did not install. See docs/codenotch.md.
+  --opencode-permission=external_directory
+                   Opt in to OpenCode's permission.external_directory for ~/.agents and
+                   ~/.config/opencode only (path patterns, allow), or set
+                   AOS_OPENCODE_PERMISSION. Existing keys are never overwritten; a string
+                   "permission" is refused. Config backed up first. Off by default.
   --plugin-migration=off|check
                    Skip (off) or only report (check) the bdb-aos plugin registration and
                    removal of AOS's own loose skill copies; same as AOS_PLUGIN_MIGRATION.
@@ -6281,6 +6335,7 @@ Options:
 
     console.log('');
     verifyEcosystemInstallation();
+    await maybeInstallCodenotch();
 
     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)' : ''}`);
 }
@@ -6317,9 +6372,13 @@ module.exports = {
     mergeCodexHooks: mergeCodexTomlHooks,
     mergeCodexTomlMcpServers,
     installGlobalHooks,
+    installGoCheck,
+    codexGateSnippet,
+    CODEX_GATE_NOTICE,
     installOpencodePlugin,
     installOpencodeCommands,
     parseOpencodeOptional,
+    maybeInstallCodenotch,
     pluginMigrationMode,
     runPluginMigration,
     installProjectHarness,