aid-installer 1.1.0 → 2.0.0

package/lib/aid-install-core.sh

@@ -1695,6 +1695,8 @@ _prune_tool_dirs() {
 
     # ------------------------------------------------------------------
     # Per-tool scoping: which native dirs + which aid/ root to walk.
+    # New layout (work-005/delivery-001): codex is unified under .codex/;
+    # cursor and antigravity no longer ship rules/ dirs.
     # ------------------------------------------------------------------
     case "$tool" in
         claude-code)
@@ -1703,15 +1705,15 @@ _prune_tool_dirs() {
             _prune_aid_subtree "${target}/.claude/aid"
             ;;
         codex)
-            # .codex ships only agents/; .agents ships skills/ + aid/ subtree.
+            # New unified layout: everything under .codex/ (agents, skills, aid).
             _prune_native_dir "${target}/.codex/agents"
-            _prune_native_dir "${target}/.agents/skills"
-            _prune_aid_subtree "${target}/.agents/aid"
+            _prune_native_dir "${target}/.codex/skills"
+            _prune_aid_subtree "${target}/.codex/aid"
             ;;
         cursor)
+            # rules/ dir removed from new layout; agents/skills/aid remain.
             _prune_native_dir "${target}/.cursor/agents"
             _prune_native_dir "${target}/.cursor/skills"
-            _prune_native_dir "${target}/.cursor/rules"
             _prune_aid_subtree "${target}/.cursor/aid"
             ;;
         copilot-cli)
@@ -1721,7 +1723,8 @@ _prune_tool_dirs() {
             _prune_aid_subtree "${target}/.github/aid"
             ;;
         antigravity)
-            _prune_native_dir "${target}/.agent/rules"
+            # rules/ dir removed from new layout; agents/skills/aid remain.
+            _prune_native_dir "${target}/.agent/agents"
             _prune_native_dir "${target}/.agent/skills"
             _prune_aid_subtree "${target}/.agent/aid"
             ;;
@@ -1735,6 +1738,138 @@ _prune_tool_dirs() {
     unset -f _in_set _prune_native_dir _prune_aid_subtree
 }
 
+# ---------------------------------------------------------------------------
+# Retired-root migration sweep (FR7/FR7a)
+# ---------------------------------------------------------------------------
+
+# _migrate_retired_layout <target> <tool>
+#
+# Complete-replacement migration: removes AID-owned content from the static
+# list of retired AID roots that no longer exist in the new bundle layout.
+# Called from install_tool BEFORE _prune_tool_dirs (same aid update pass).
+#
+# Retired roots swept per tool:
+#   codex:       .agents/                     (split layout retired)
+#   cursor:      .cursor/rules/               (rules dir retired)
+#   antigravity: .agent/rules/                (rules dir retired)
+#   all tools:   .cursor/rules/, .agent/rules/ are cursor/antigravity only
+#
+# Ownership markers applied (content-isolation.md rules 1+2):
+#   Marker 1: filename starts with "aid-" (tool-native dir files)
+#   Marker 2: lives inside an "aid/" subtree
+#
+# Marker 3 (AID:BEGIN/END region in root files) is NOT touched here;
+# that is handled by _copy_root_agent_file exclusively.
+#
+# User content (no marker) is NEVER removed.
+# Idempotent: a no-op when the retired path is already absent.
+# Returns count of retired items removed (written to _MIGRATE_RETIRED_COUNT).
+_migrate_retired_layout() {
+    local target="$1"
+    local tool="$2"
+    local list_only="${3:-0}"   # 1 = dry-run enumeration only (no removals)
+    _MIGRATE_RETIRED_COUNT=0
+
+    # Return 1 if a file is AID-owned (marker 1 or 2); 0 if user content.
+    _is_aid_owned_file() {
+        local f="$1"
+        local base
+        base="$(basename "$f")"
+        # Marker 1: aid- prefix.
+        if [[ "$base" == aid-* ]]; then return 0; fi
+        # Marker 2: lives inside an aid/ folder (any path component named "aid").
+        local dir
+        dir="$(dirname "$f")"
+        while [[ "$dir" != "$target" && "$dir" != "/" && "$dir" != "." ]]; do
+            if [[ "$(basename "$dir")" == "aid" ]]; then return 0; fi
+            dir="$(dirname "$dir")"
+        done
+        # No marker -- user content.
+        return 1
+    }
+
+    # Move one AID-owned file (marker 1 or 2) to <target>/.aid/.trash/<rel-path>.
+    # In list_only mode: print the path instead of moving it (no writes).
+    _retire_file() {
+        local f="$1"
+        [[ -f "$f" ]] || return 0
+        if _is_aid_owned_file "$f"; then
+            if [[ "$list_only" -eq 1 ]]; then
+                echo "  move to trash: ${f}"
+                _MIGRATE_RETIRED_COUNT=$((_MIGRATE_RETIRED_COUNT + 1))
+            else
+                # Compute path relative to $target and move to the trash dir.
+                local rel dest
+                rel="${f#${target}/}"
+                dest="${target}/.aid/.trash/${rel}"
+                mkdir -p "$(dirname "$dest")"
+                mv -f "$f" "$dest"
+                _MIGRATE_RETIRED_COUNT=$((_MIGRATE_RETIRED_COUNT + 1))
+                if [[ "${AID_VERBOSE:-0}" -eq 1 ]]; then echo "Trashed: ${f} -> ${dest}"; fi
+            fi
+        fi
+        return 0
+    }
+
+    # Sweep one retired root directory: remove AID-owned files, then prune
+    # now-empty subdirs, then remove the root dir itself if now empty.
+    # In list_only mode: enumerate would-be-removed files, make no changes.
+    _sweep_retired_root() {
+        local rdir="$1"
+        [[ -d "$rdir" ]] || return 0
+        # Walk all files under the retired root.
+        local fpath
+        while IFS= read -r -d '' fpath; do
+            _retire_file "$fpath"
+        done < <(find "$rdir" -type f -print0 2>/dev/null | sort -z)
+        if [[ "$list_only" -eq 1 ]]; then return 0; fi
+        # Prune now-empty subdirs (deepest first).
+        local dpath
+        while IFS= read -r dpath; do
+            if [[ -d "$dpath" ]]; then
+                local rem
+                rem="$(find "$dpath" -mindepth 1 2>/dev/null | head -1)"
+                if [[ -z "$rem" ]]; then
+                    rmdir "$dpath" 2>/dev/null || true
+                    if [[ "${AID_VERBOSE:-0}" -eq 1 ]]; then echo "Retired dir: ${dpath}"; fi
+                fi
+            fi
+        done < <(find "$rdir" -mindepth 1 -type d 2>/dev/null | sort -r)
+        # Remove the retired root itself if now empty.
+        if [[ -d "$rdir" ]]; then
+            local rem
+            rem="$(find "$rdir" -mindepth 1 2>/dev/null | head -1)"
+            if [[ -z "$rem" ]]; then
+                rmdir "$rdir" 2>/dev/null || true
+                if [[ "${AID_VERBOSE:-0}" -eq 1 ]]; then echo "Retired root dir: ${rdir}"; fi
+            fi
+        fi
+        return 0
+    }
+
+    case "$tool" in
+        codex)
+            # Retired root: .agents/ (old split layout -- skills/ + aid/ lived here).
+            _sweep_retired_root "${target}/.agents"
+            ;;
+        cursor)
+            # Retired root: .cursor/rules/ (rules dir no longer in new layout).
+            _sweep_retired_root "${target}/.cursor/rules"
+            ;;
+        antigravity)
+            # Retired root: .agent/rules/ (rules dir no longer in new layout).
+            _sweep_retired_root "${target}/.agent/rules"
+            ;;
+        # claude-code and copilot-cli have no retired roots in this migration.
+    esac
+
+    if [[ "$list_only" -eq 0 && "$_MIGRATE_RETIRED_COUNT" -gt 0 ]]; then
+        echo "  ${_MIGRATE_RETIRED_COUNT} retired AID file(s) moved to .aid/.trash/"
+    fi
+
+    unset -f _is_aid_owned_file _retire_file _sweep_retired_root
+}
+
 # ---------------------------------------------------------------------------
 # Version marker
 # ---------------------------------------------------------------------------
@@ -1786,7 +1921,8 @@ install_tool() {
             fi
             ;;
         codex)
-            # .codex/ + .agents/ + AGENTS.md
+            # New unified layout: .codex/ only (agents, skills, aid all under .codex/).
+            # .agents/ is the RETIRED split layout -- handled by _migrate_retired_layout.
             if [[ -d "${staging}/.codex" ]]; then
                 copy_dir "${staging}/.codex" "${target}/.codex" "$force"
                 while IFS= read -r -d '' f; do
@@ -1794,13 +1930,6 @@ install_tool() {
                     install_paths+=("$rel")
                 done < <(find "${staging}/.codex" -type f -print0 2>/dev/null | sort -z)
             fi
-            if [[ -d "${staging}/.agents" ]]; then
-                copy_dir "${staging}/.agents" "${target}/.agents" "$force"
-                while IFS= read -r -d '' f; do
-                    local rel="${f#${staging}/}"
-                    install_paths+=("$rel")
-                done < <(find "${staging}/.agents" -type f -print0 2>/dev/null | sort -z)
-            fi
             ;;
         cursor)
             # .cursor/ + AGENTS.md
@@ -1852,9 +1981,37 @@ install_tool() {
         fi
     fi
 
+    # Manifest-seam entry gate (PLAN risk #3, delivery-001->002 seam).
+    # Runs BEFORE manifest_write so a contaminated bundle never writes to disk.
+    # Assert that the new bundle's path set does NOT contain any retired roots.
+    # If a retired path leaked into the new manifest, fail loudly -- do not prune
+    # against a contaminated manifest (content-isolation cornerstone).
+    local _retired_roots=(".agents/" ".cursor/rules/" ".agent/rules/")
+    local _rr _leaked
+    for _rr in "${_retired_roots[@]}"; do
+        for _p in "${install_paths[@]+"${install_paths[@]}"}"; do
+            if [[ "$_p" == "${_rr}"* ]]; then
+                _leaked="$_p"
+                break
+            fi
+        done
+        if [[ -n "${_leaked:-}" ]]; then
+            echo "ERROR: aid-install-core: manifest-seam violation: retired root '${_rr}' leaked into the new bundle manifest (path: ${_leaked}). Aborting install to protect user content." >&2
+            return 1
+        fi
+    done
+    unset _rr _leaked
+
     # Write manifest (merge).
     manifest_write "$manifest" "$tool" "$version" "install_paths" "root_entries"
 
+    # Retired-root migration sweep (FR7/FR7a).
+    # Remove AID-owned content from retired layout dirs BEFORE the normal prune,
+    # so that old .agents/, .cursor/rules/, .agent/rules/ trees are cleaned up.
+    # A non-zero rc from install_tool is treated as a mid-commit failure (caller
+    # prints the "re-run to heal" message); this function returns 0 (WARN-not-fail).
+    _migrate_retired_layout "$target" "$tool"
+
     # Prune stale AID-owned files (Pillar 2, R7).
     # Build an associative array from the new manifest path set for O(1) lookup.
     declare -A _prune_manifest_set=()

package/package.json

@@ -1,7 +1,9 @@
 {
   "name": "aid-installer",
-  "version": "1.1.0",
-  "description": "AID CLI installer - puts the persistent aid command on PATH via npm",
+  "version": "2.0.0",
+  "description": "AID (AI Integrated Development) CLI installer - puts the persistent aid command on PATH via npm",
+  "author": "Andre Vianna",
+  "homepage": "https://aid.casuloailabs.com",
   "bin": {
     "aid": "bin/aid.js"
   },
@@ -18,18 +20,19 @@
     "bin/",
     "lib/",
     "dashboard/",
-    "scripts/",
+    "scripts/postinstall.js",
     "VERSION",
     "README.md",
     "LICENSE"
   ],
   "keywords": [
     "aid",
-    "agentic",
-    "iterative",
+    "AI",
+    "integrated",
     "development",
     "cli",
-    "installer"
+    "installer",
+    "methodology"
   ],
   "license": "MIT",
   "repository": {

package/scripts/vendor.js

@@ -1,98 +0,0 @@
-#!/usr/bin/env node
-// vendor.js - Copy the aid-cli source files from the repo root into the npm package.
-//
-// Run automatically as the `prepack` npm script so `npm pack` and
-// `npm publish` always ship the current source.
-//
-// Source of truth is the repo root (two levels above packages/npm/).
-// Destination is packages/npm/{bin,lib,dashboard/,VERSION} (gitignored; generated at pack time).
-//
-// Files copied (mirrors release.sh Step-5 aid-cli bundle):
-//   bin/aid              -> packages/npm/bin/aid
-//   bin/aid.ps1          -> packages/npm/bin/aid.ps1
-//   bin/aid.cmd          -> packages/npm/bin/aid.cmd
-//   lib/aid-install-core.sh  -> packages/npm/lib/aid-install-core.sh
-//   lib/AidInstallCore.psm1  -> packages/npm/lib/AidInstallCore.psm1
-//   VERSION              -> packages/npm/VERSION
-//
-// Dashboard server+reader unit (12 files, curated -- excludes tests/ __pycache__ *.pyc README):
-//   dashboard/home.html                   -> packages/npm/dashboard/home.html
-//   dashboard/index.html                  -> packages/npm/dashboard/index.html
-//   dashboard/reader/__init__.py          -> packages/npm/dashboard/reader/__init__.py
-//   dashboard/reader/reader.py            -> packages/npm/dashboard/reader/reader.py
-//   dashboard/reader/models.py            -> packages/npm/dashboard/reader/models.py
-//   dashboard/reader/parsers.py           -> packages/npm/dashboard/reader/parsers.py
-//   dashboard/reader/derivation.py        -> packages/npm/dashboard/reader/derivation.py
-//   dashboard/reader/locator.py           -> packages/npm/dashboard/reader/locator.py
-//   dashboard/server/server.py            -> packages/npm/dashboard/server/server.py
-//   dashboard/server/server.mjs           -> packages/npm/dashboard/server/server.mjs
-//   dashboard/server/reader.mjs           -> packages/npm/dashboard/server/reader.mjs
-//   dashboard/server/__init__.py          -> packages/npm/dashboard/server/__init__.py
-
-'use strict';
-
-var fs   = require('fs');
-var path = require('path');
-
-// packages/npm/scripts/vendor.js is three levels below repo root.
-var repoRoot = path.join(__dirname, '..', '..', '..');
-var pkgRoot  = path.join(__dirname, '..');
-
-var copies = [
-    ['bin/aid',                          'bin/aid'],
-    ['bin/aid.ps1',                      'bin/aid.ps1'],
-    ['bin/aid.cmd',                      'bin/aid.cmd'],
-    ['lib/aid-install-core.sh',          'lib/aid-install-core.sh'],
-    ['lib/AidInstallCore.psm1',          'lib/AidInstallCore.psm1'],
-    ['VERSION',                          'VERSION'],
-    // Dashboard server+reader unit (12 files, curated).
-    ['dashboard/home.html',              'dashboard/home.html'],
-    ['dashboard/index.html',             'dashboard/index.html'],
-    ['dashboard/reader/__init__.py',     'dashboard/reader/__init__.py'],
-    ['dashboard/reader/reader.py',       'dashboard/reader/reader.py'],
-    ['dashboard/reader/models.py',       'dashboard/reader/models.py'],
-    ['dashboard/reader/parsers.py',      'dashboard/reader/parsers.py'],
-    ['dashboard/reader/derivation.py',   'dashboard/reader/derivation.py'],
-    ['dashboard/reader/locator.py',      'dashboard/reader/locator.py'],
-    ['dashboard/server/server.py',       'dashboard/server/server.py'],
-    ['dashboard/server/server.mjs',      'dashboard/server/server.mjs'],
-    ['dashboard/server/reader.mjs',      'dashboard/server/reader.mjs'],
-    ['dashboard/server/__init__.py',     'dashboard/server/__init__.py'],
-];
-
-// Clean slate: remove any prior vendored payload (lib/ dir, dashboard/ dir, the vendored
-// bin scripts, VERSION) so stray runtime artifacts or files from an older version never
-// ship. Keep the committed shim bin/aid.js.
-try { fs.rmSync(path.join(pkgRoot, 'lib'),       { recursive: true, force: true }); } catch (e) {}
-try { fs.rmSync(path.join(pkgRoot, 'dashboard'), { recursive: true, force: true }); } catch (e) {}
-['bin/aid', 'bin/aid.ps1', 'bin/aid.cmd', 'VERSION'].forEach(function (f) {
-    try { fs.rmSync(path.join(pkgRoot, f), { force: true }); } catch (e) {}
-});
-
-// Ensure destination directories exist.
-var dirs = ['bin', 'lib', 'dashboard/reader', 'dashboard/server'];
-for (var i = 0; i < dirs.length; i++) {
-    var d = path.join(pkgRoot, dirs[i]);
-    if (!fs.existsSync(d)) {
-        fs.mkdirSync(d, { recursive: true });
-    }
-}
-
-var ok = true;
-for (var j = 0; j < copies.length; j++) {
-    var src  = path.join(repoRoot, copies[j][0]);
-    var dest = path.join(pkgRoot,  copies[j][1]);
-    try {
-        fs.copyFileSync(src, dest);
-        console.log('vendor: copied ' + copies[j][0] + ' -> packages/npm/' + copies[j][1]);
-    } catch (e) {
-        console.error('vendor: ERROR copying ' + src + ': ' + e.message);
-        ok = false;
-    }
-}
-
-if (!ok) {
-    process.exit(1);
-}
-
-console.log('vendor: done. 18 files vendored into packages/npm/.');