rea-agents 6.2.0 → 6.4.0

package/dist/application/SupportedClients.js

@@ -1,5 +1,8 @@
-import { isAbsolute, join } from "node:path";
+import { dirname, isAbsolute, join, resolve, win32 } from "node:path";
+import { fileURLToPath } from "node:url";
 import { lstatSync } from "node:fs";
+import { err, ok } from "../domain/result.js";
+import { HermesClientPathError, resolveHermesClientHome, } from "./HermesClientHome.js";
 const vscodeUserDirectory = ({ home, platform, env, }) => {
     if (platform === "win32")
         return join(env.APPDATA ?? join(home, "AppData", "Roaming"), "Code", "User");
@@ -16,8 +19,24 @@ const claudeDesktopDirectory = ({ home, platform, env, }) => {
 };
 const claudeCodeConfigDirectory = ({ home, env }) => env.CLAUDE_CONFIG_DIR ?? home;
 const claudeCodeMarkerDirectory = ({ home, env }) => env.CLAUDE_CONFIG_DIR ?? join(home, ".claude");
-const codexDirectory = ({ home, env }) => env.CODEX_HOME ?? join(home, ".codex");
-const grokDirectory = ({ home, env }) => env.GROK_HOME ?? join(home, ".grok");
+const codexDirectory = ({ home, env }) => env.CODEX_HOME || join(home, ".codex");
+/** Match Qwen Code's home override, including tilde and cwd-relative paths. */
+const qwenCodeDirectory = ({ home, env }) => {
+    const override = env.QWEN_HOME;
+    if (!override)
+        return join(home, ".qwen");
+    const expanded = override === "~"
+        ? home
+        : override.startsWith("~/") || override.startsWith("~\\")
+            ? join(home, ...override
+                .slice(2)
+                .split(/[/\\]+/)
+                .filter(Boolean))
+            : override;
+    return isAbsolute(expanded) ? expanded : resolve(expanded);
+};
+const grokDirectory = ({ home, env }) => env.GROK_HOME || join(home, ".grok");
+const hermesDirectory = ({ home, platform, env }) => resolveHermesClientHome(home, platform, env);
 /** Grok Bot uses an absolute SAND_DATA_ROOT; anything else stays ~/.grokbot. */
 const grokBotDirectory = ({ home, env }) => {
     const root = env.SAND_DATA_ROOT;
@@ -34,20 +53,102 @@ export const GROK_BOT_MANUAL_REGISTRATION_REMEDIATION = "Grok Bot keeps connecto
 export const manualRegistrationRemediation = (clientName) => clientName === "grok_bot"
     ? GROK_BOT_MANUAL_REGISTRATION_REMEDIATION
     : undefined;
+const OMP_PROFILE_NAME = /^[a-z0-9][a-z0-9._-]{0,63}$/u;
+const OMP_RESERVED_PROFILE = /^(?:CON|PRN|AUX|NUL|COM[0-9]|LPT[0-9])(?:\..*)?$/iu;
+/**
+ * The OMP agent directory whose `mcp.json` holds user-scope MCP servers. OMP
+ * joins PI_CONFIG_DIR to the home directory, and a named profile ignores
+ * PI_CODING_AGENT_DIR. Relative overrides use the setup process working directory.
+ */
+const ompAgentDirectory = (context) => {
+    const root = join(context.home, context.env.PI_CONFIG_DIR || ".omp");
+    // OMP_PROFILE wins even when empty. Match OMP's validation on every host.
+    const profile = (context.env.OMP_PROFILE ?? context.env.PI_PROFILE)?.trim();
+    if (profile !== undefined && profile !== "" && profile !== "default") {
+        if (!OMP_PROFILE_NAME.test(profile) ||
+            profile.endsWith(".") ||
+            OMP_RESERVED_PROFILE.test(profile))
+            return err({
+                path: root,
+                message: `Invalid OMP profile ${JSON.stringify(profile)}: names must match ^[a-z0-9][a-z0-9._-]{0,63}$, cannot end with ".", and cannot be a Windows reserved device name (CON, PRN, AUX, NUL, COM0-9, LPT0-9, including extensions). Repair OMP_PROFILE or PI_PROFILE before configuring OMP.`,
+            });
+        return ok(join(root, "profiles", profile, "agent"));
+    }
+    const override = context.env.PI_CODING_AGENT_DIR;
+    return ok(override ? resolve(override) : join(root, "agent"));
+};
+/**
+ * Pi's public getAgentDir()/normalizePath semantics, not OMP's profiles.
+ * Keep relative overrides relative: filesystem consumers resolve them in cwd.
+ */
+const piAgentDirectory = ({ home, platform, env, }) => {
+    const paths = platform === "win32" ? win32 : { join };
+    let directory = env.PI_CODING_AGENT_DIR;
+    if (!directory)
+        return paths.join(home, ".pi", "agent");
+    if (platform === "win32" &&
+        directory.startsWith("/") &&
+        !directory.startsWith("//") &&
+        !directory.includes("\\")) {
+        const drive = /^\/(?:mnt\/|cygdrive\/)?([a-z])(?:\/(.*))?$/iu.exec(directory);
+        if (drive !== null)
+            directory = `${drive[1]?.toUpperCase()}:\\${drive[2]?.replaceAll("/", "\\") ?? ""}`;
+    }
+    if (directory === "~")
+        return home;
+    if (directory.startsWith("~/") ||
+        (platform === "win32" && directory.startsWith("~\\")))
+        return paths.join(home, directory.slice(2));
+    if (directory.startsWith("file://"))
+        return fileURLToPath(directory, { windows: platform === "win32" });
+    return directory;
+};
 const copilotDirectory = ({ home, env }) => env.COPILOT_HOME ?? join(home, ".copilot");
 const commandCodeDirectory = ({ home }) => join(home, ".commandcode");
-const opencodeDirectory = ({ home, env }) => join(env.XDG_CONFIG_HOME ?? join(home, ".config"), "opencode");
+/**
+ * OpenCode appends `OPENCODE_CONFIG_DIR` only when the value is non-empty.
+ * An empty variable is the same as unset and leaves the XDG directory in place.
+ */
+const openCodeOverrideDirectory = (env) => {
+    const directory = env.OPENCODE_CONFIG_DIR;
+    return directory === undefined || directory === "" ? undefined : directory;
+};
+const opencodeDirectory = (context) => openCodeOverrideDirectory(context.env) ??
+    join(context.env.XDG_CONFIG_HOME ?? join(context.home, ".config"), "opencode");
+/** OpenCode loads global JSON before JSONC, then explicit file and directory overrides. */
+const openCodeConfigurationPaths = (context) => {
+    const directory = join(context.env.XDG_CONFIG_HOME ?? join(context.home, ".config"), "opencode");
+    const overrideDirectory = openCodeOverrideDirectory(context.env);
+    const paths = [
+        join(directory, "config.json"),
+        join(directory, "opencode.json"),
+        join(directory, "opencode.jsonc"),
+        ...(context.env.OPENCODE_CONFIG ? [context.env.OPENCODE_CONFIG] : []),
+        ...(overrideDirectory !== undefined
+            ? [
+                join(overrideDirectory, "opencode.json"),
+                join(overrideDirectory, "opencode.jsonc"),
+            ]
+            : []),
+    ];
+    const resolved = paths.map((path) => resolve(path));
+    return resolved.filter((path, index) => resolved.lastIndexOf(path) === index);
+};
 const existingOpenCodeConfigPath = (context) => {
-    if (context.env.OPENCODE_CONFIG !== undefined)
-        return context.env.OPENCODE_CONFIG;
-    const directory = opencodeDirectory(context);
-    const candidates = [
-        "opencode.json",
-        "opencode.jsonc",
-        ".opencode.json",
-        ".opencode.jsonc",
-    ].map((filename) => join(directory, filename));
-    return (candidates.find((path) => {
+    // The selected directory is loaded after an explicit file by OpenCode V1.
+    const overrideDirectory = openCodeOverrideDirectory(context.env);
+    const candidates = overrideDirectory !== undefined
+        ? [
+            join(overrideDirectory, "opencode.json"),
+            join(overrideDirectory, "opencode.jsonc"),
+        ].map((path) => resolve(path))
+        : context.env.OPENCODE_CONFIG
+            ? [resolve(context.env.OPENCODE_CONFIG)]
+            : [
+                join(opencodeDirectory(context), "opencode.json"),
+                join(opencodeDirectory(context), "opencode.jsonc"),
+            ].map((path) => resolve(path));
+    return ([...candidates].reverse().find((path) => {
         try {
             lstatSync(path);
             return true;
@@ -58,17 +159,44 @@ const existingOpenCodeConfigPath = (context) => {
                 cause.code === "ENOENT");
         }
     }) ??
-        candidates[0] ??
-        join(directory, "opencode.json"));
+        resolve(overrideDirectory !== undefined
+            ? join(overrideDirectory, "opencode.json")
+            : context.env.OPENCODE_CONFIG ||
+                join(opencodeDirectory(context), "opencode.json")));
+};
+const geminiSettings = ({ home, platform, env, }) => {
+    const system = env.GEMINI_CLI_SYSTEM_SETTINGS_PATH ||
+        (platform === "darwin"
+            ? "/Library/Application Support/GeminiCli/settings.json"
+            : platform === "win32"
+                ? "C:\\ProgramData\\gemini-cli\\settings.json"
+                : "/etc/gemini-cli/settings.json");
+    const trustOverride = env.GEMINI_RESTRICTED_MODE === "true" ||
+        env.GEMINI_CLI_TRUST_WORKSPACE === "false"
+        ? false
+        : env.GEMINI_CLI_TRUST_WORKSPACE === "true"
+            ? true
+            : undefined;
+    return {
+        systemPath: system,
+        defaultsPath: env.GEMINI_CLI_SYSTEM_DEFAULTS_PATH ||
+            join(dirname(system), "system-defaults.json"),
+        workspaceDirectory: process.cwd(),
+        trustedFoldersPath: env.GEMINI_CLI_TRUSTED_FOLDERS_PATH ||
+            join(env.GEMINI_CLI_HOME || home, ".gemini", "trustedFolders.json"),
+        ...(trustOverride === undefined ? {} : { trustOverride }),
+        platform,
+    };
 };
 const devinDirectory = ({ home, platform, env }) => platform === "win32"
     ? join(env.APPDATA ?? join(home, "AppData", "Roaming"), "devin")
-    : join(home, ".config", "devin");
+    : join(env.XDG_CONFIG_HOME || join(home, ".config"), "devin");
 /** Stable product metadata used to derive setup discovery and documentation. */
 export const SUPPORTED_CLIENT_DEFINITIONS = [
     {
         name: "claude_code",
         displayName: "Claude Code",
+        skillPath: ({ home, env }) => join(env.CLAUDE_CONFIG_DIR ?? join(home, ".claude"), "skills"),
         configPath: (context) => join(claudeCodeConfigDirectory(context), ".claude.json"),
         markerPath: claudeCodeMarkerDirectory,
         format: "json",
@@ -97,8 +225,10 @@ export const SUPPORTED_CLIENT_DEFINITIONS = [
     {
         name: "gemini_cli",
         displayName: "Gemini CLI",
-        configPath: [".gemini", "settings.json"],
-        markerPath: [".gemini"],
+        geminiSettings,
+        configPath: ({ home, env }) => join(env.GEMINI_CLI_HOME || home, ".gemini", "settings.json"),
+        markerPath: ({ home, env }) => join(env.GEMINI_CLI_HOME || home, ".gemini"),
+        skillPath: ({ home, env }) => join(env.GEMINI_CLI_HOME || home, ".agents", "skills"),
         format: "json",
     },
     {
@@ -119,12 +249,14 @@ export const SUPPORTED_CLIENT_DEFINITIONS = [
         name: "opencode",
         displayName: "OpenCode",
         configPath: existingOpenCodeConfigPath,
+        configPaths: openCodeConfigurationPaths,
         markerPath: opencodeDirectory,
         format: "opencode",
     },
     {
         name: "antigravity",
         displayName: "Antigravity",
+        skillPath: [".gemini", "config", "skills"],
         configPath: [".gemini", "config", "mcp_config.json"],
         markerPath: [".gemini", "config"],
         format: "json",
@@ -143,6 +275,13 @@ export const SUPPORTED_CLIENT_DEFINITIONS = [
         markerPath: commandCodeDirectory,
         format: "commandcode",
     },
+    {
+        name: "qwen_code",
+        displayName: "Qwen Code",
+        configPath: (context) => join(qwenCodeDirectory(context), "settings.json"),
+        markerPath: qwenCodeDirectory,
+        format: "json",
+    },
     {
         name: "vscode",
         displayName: "VS Code",
@@ -157,6 +296,31 @@ export const SUPPORTED_CLIENT_DEFINITIONS = [
         markerPath: grokDirectory,
         format: "grok",
     },
+    {
+        name: "omp",
+        displayName: "OMP",
+        configPath: (context) => {
+            const directory = ompAgentDirectory(context);
+            return directory.ok ? ok(join(directory.value, "mcp.json")) : directory;
+        },
+        markerPath: ompAgentDirectory,
+        format: "omp",
+    },
+    {
+        name: "pi",
+        displayName: "Pi",
+        configPath: (context) => (context.platform === "win32" ? win32 : { join }).join(piAgentDirectory(context), "mcp.json"),
+        markerPath: piAgentDirectory,
+        format: "pi",
+    },
+    {
+        name: "hermes",
+        displayName: "Hermes",
+        skillPath: (context) => join(hermesDirectory(context), "skills"),
+        configPath: (context) => join(hermesDirectory(context), "config.yaml"),
+        markerPath: hermesDirectory,
+        format: "hermes",
+    },
     {
         name: "grok_bot",
         displayName: "Grok Bot",
@@ -165,24 +329,128 @@ export const SUPPORTED_CLIENT_DEFINITIONS = [
         format: "unsupported",
     },
 ];
-const resolvePath = (path, context) => typeof path === "function" ? path(context) : join(context.home, ...path);
+/**
+ * Paths whose presence means doctor and setup should inspect the client.
+ * Layered sources count: OpenCode still loads its XDG files when a custom
+ * directory override does not exist.
+ */
+export const clientEvidencePaths = (client) => [
+    ...new Set([
+        client.configPath,
+        ...(client.configPaths ?? []),
+        client.markerPath,
+    ].filter((path) => path !== undefined && path.length > 0)),
+];
+const resolvePath = (path, context) => {
+    const resolved = typeof path === "function" ? path(context) : join(context.home, ...path);
+    return typeof resolved === "string" ? ok(resolved) : resolved;
+};
 /** Describe every client location that setup, doctor, or uninstall may inspect. */
-export const supportedClients = (home, platform = process.platform, env = {
-    APPDATA: process.env.APPDATA,
-    CLAUDE_CONFIG_DIR: process.env.CLAUDE_CONFIG_DIR,
-    CODEX_HOME: process.env.CODEX_HOME,
-    COPILOT_HOME: process.env.COPILOT_HOME,
-    GROK_HOME: process.env.GROK_HOME,
-    OPENCODE_CONFIG: process.env.OPENCODE_CONFIG,
-    SAND_DATA_ROOT: process.env.SAND_DATA_ROOT,
-    XDG_CONFIG_HOME: process.env.XDG_CONFIG_HOME,
-}) => {
+export const supportedClients = (home, platform = process.platform, env = process.env) => {
     const context = { home, platform, env };
-    return SUPPORTED_CLIENT_DEFINITIONS.map((definition) => ({
-        name: definition.name,
-        displayName: definition.displayName,
-        configPath: resolvePath(definition.configPath, context),
-        markerPath: resolvePath(definition.markerPath, context),
-        format: definition.format,
-    }));
+    const definitions = SUPPORTED_CLIENT_DEFINITIONS;
+    return definitions.map((definition) => {
+        try {
+            const config = resolvePath(definition.configPath, context);
+            const marker = config.ok
+                ? resolvePath(definition.markerPath, context)
+                : config;
+            if (!config.ok)
+                return {
+                    name: definition.name,
+                    displayName: definition.displayName,
+                    format: definition.format,
+                    configPath: config.error.path,
+                    configPathError: config.error.message,
+                };
+            if (!marker.ok)
+                return {
+                    name: definition.name,
+                    displayName: definition.displayName,
+                    format: definition.format,
+                    configPath: marker.error.path,
+                    configPathError: marker.error.message,
+                };
+            const configPath = config.value;
+            return {
+                name: definition.name,
+                displayName: definition.displayName,
+                configPath,
+                ...(definition.geminiSettings === undefined
+                    ? {}
+                    : { geminiSettings: definition.geminiSettings(context) }),
+                ...(definition.configPaths === undefined
+                    ? {}
+                    : {
+                        configPaths: [
+                            ...new Set([...definition.configPaths(context), configPath]),
+                        ],
+                    }),
+                markerPath: marker.value,
+                format: definition.format,
+            };
+        }
+        catch (cause) {
+            if (cause instanceof HermesClientPathError)
+                return {
+                    name: definition.name,
+                    displayName: definition.displayName,
+                    format: definition.format,
+                    configPath: cause.path,
+                    configPathError: cause.message,
+                };
+            if (definition.name !== "pi")
+                throw cause;
+            return {
+                name: definition.name,
+                displayName: definition.displayName,
+                format: definition.format,
+                configPath: env.PI_CODING_AGENT_DIR ?? "",
+                configPathError: `Invalid PI_CODING_AGENT_DIR: ${cause instanceof Error ? cause.message : String(cause)}. Repair the override before configuring Pi.`,
+            };
+        }
+    });
+};
+/** Resolve personal skill roots using the same client environment as setup. */
+export const clientSkillDirectories = (home, clientIds, environment = {}, platform = process.platform) => {
+    const definitions = SUPPORTED_CLIENT_DEFINITIONS;
+    const selected = clientIds === undefined
+        ? [
+            "shared",
+            ...definitions
+                .filter(({ skillPath }) => skillPath !== undefined)
+                .map(({ name }) => name),
+        ]
+        : clientIds.length === 0
+            ? ["shared"]
+            : clientIds;
+    const destinations = new Map();
+    for (const client of selected) {
+        const definition = definitions.find(({ name }) => name === client);
+        let directory;
+        try {
+            const resolved = definition?.skillPath === undefined
+                ? ok(join(home, ".agents", "skills"))
+                : resolvePath(definition.skillPath, {
+                    home,
+                    platform,
+                    env: environment,
+                });
+            if (!resolved.ok)
+                continue;
+            directory = resolved.value;
+        }
+        catch (cause) {
+            // Registration diagnostics own an unresolved profile; never fall back to another skill root.
+            if (cause instanceof HermesClientPathError)
+                continue;
+            throw cause;
+        }
+        if (!destinations.has(directory))
+            destinations.set(directory, {
+                client: directory === join(home, ".agents", "skills") ? "shared" : client,
+                directory,
+            });
+    }
+    return [...destinations.values()].sort((left, right) => left.directory.localeCompare(right.directory));
 };

package/dist/application/Uninstall.js

@@ -1,21 +1,24 @@
 import { parseClientConfiguration, serializeClientConfiguration, clientServerPath, legacyClientServerPath, withClientServers, } from "./ClientConfigurationDocument.js";
-import { copyFile, lstat, readFile, realpath, rm } from "node:fs/promises";
+import { copyFile, lstat, realpath, rm } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 import { homeDirectoryFromEnvironment } from "../config/homeDirectory.js";
 import { join } from "node:path";
 import writeFileAtomic from "write-file-atomic";
 import { z } from "zod";
 import { PRODUCT_IDENTITY } from "../identity.js";
+import { isManagedSkillManifest, MANAGED_SKILL_FILES, readSkillFile, skillDestinations, } from "./SetupSkill.js";
 import { isOwnedClientRegistrationCommand } from "./ClientRegistrationIdentity.js";
 import { resolveClientConfigTransactionPath } from "./ClientConfigPath.js";
+import { readRegularFileText } from "./RegularFileRead.js";
 import { manualRegistrationRemediation, supportedClients, } from "./SupportedClients.js";
 const systemFileSystem = {
-    readText: (path) => readFile(path, "utf8"),
+    readText: (path) => readRegularFileText(path),
+    readRegularText: readSkillFile,
     copy: (source, destination) => copyFile(source, destination, fsConstants.COPYFILE_EXCL),
     writeText: (path, contents) => writeFileAtomic(path, contents, { encoding: "utf8" }),
     stat: (path) => lstat(path),
     realpath: (path) => realpath(path),
-    remove: (path) => rm(path, { recursive: true }),
+    remove: (path, recursive = true) => rm(path, { recursive }),
 };
 /** Whether any requested REA-owned uninstall action failed. */
 export const isUninstallFailure = (result) => {
@@ -56,11 +59,12 @@ export const runUninstall = async (purgeData, host = systemUninstallHost()) => {
         status: "retained",
         detail: "Hopper is not owned by REA uninstall.",
     });
+    const reported = collapseUninstallItems(items);
     return {
-        status: items.some(({ status }) => status === "failed")
+        status: reported.some(({ status }) => status === "failed")
             ? "failed"
             : "complete",
-        items,
+        items: reported,
     };
 };
 /**
@@ -87,7 +91,12 @@ const removeAll = async (clients, purgeData, host) => {
 export const systemUninstallHost = (selectedHome = undefined, fileSystem = systemFileSystem, environment = process.env, platform = process.platform) => {
     const home = selectedHome ?? homeDirectoryFromEnvironment(environment, platform);
     return {
-        clients: () => Promise.resolve(supportedClients(home, platform, environment)),
+        clients: () => Promise.resolve(supportedClients(home, platform, environment).flatMap((client) => client.configPaths === undefined
+            ? [client]
+            : client.configPaths.map((configPath) => ({
+                ...client,
+                configPath,
+            })))),
         inspectClient: async (client) => {
             const read = await readClientConfiguration(client, fileSystem);
             return read.kind === "item" && read.item.status === "failed"
@@ -95,7 +104,7 @@ export const systemUninstallHost = (selectedHome = undefined, fileSystem = syste
                 : undefined;
         },
         removeClient: (client) => removeClient(client, fileSystem),
-        removeSkill: () => removeManagedSkills(home, fileSystem),
+        removeSkill: () => removeManagedSkills(home, fileSystem, environment, platform),
         purgeData: async () => [
             await removeManagedPath(join(home, ".rea/cache"), "cache", fileSystem),
             await removeManagedPath(join(home, ".rea/state"), "state", fileSystem),
@@ -103,6 +112,8 @@ export const systemUninstallHost = (selectedHome = undefined, fileSystem = syste
     };
 };
 const readClientConfiguration = async (client, fileSystem) => {
+    if (client.configPathError !== undefined)
+        return itemRead(item(client.name, "failed", client.configPathError));
     if (client.format === "unsupported")
         return itemRead(item(client.name, "skipped", manualRegistrationRemediation(client.name) ??
             "This client has no documented local MCP configuration boundary."));
@@ -224,8 +235,161 @@ const removeManagedPath = async (path, name, fileSystem) => {
             : item(name, "failed", "This item could not be removed. Check file permissions, then rerun uninstall.");
     }
 };
-const removeManagedSkills = async (home, fileSystem) => removeManagedPath(join(home, ".agents/skills", PRODUCT_IDENTITY.skillName), "skill", fileSystem);
+const removeManagedSkills = async (home, fileSystem, environment, platform) => {
+    const results = await Promise.all(skillDestinations(home, undefined, environment, platform).map(({ client, path }) => removeManagedSkill(path, client === "claude_code" ? "Claude Code skill" : "skill", fileSystem)));
+    const failed = results.find(({ status }) => status === "failed");
+    if (failed !== undefined)
+        return item("skill", "failed", results
+            .map(({ name, status, detail }) => `${name}: ${status} (${detail})`)
+            .join(" "));
+    const status = results.some(({ status: resultStatus }) => resultStatus === "removed")
+        ? "removed"
+        : results.some(({ status: resultStatus }) => resultStatus === "retained")
+            ? "retained"
+            : "skipped";
+    return item("skill", status, results
+        .map(({ name, status: resultStatus, detail }) => `${name}: ${resultStatus} (${detail})`)
+        .join(" "));
+};
+const removeManagedSkill = async (path, name, fileSystem) => {
+    let root;
+    try {
+        root = await fileSystem.stat(path);
+    }
+    catch (cause) {
+        return isMissing(cause)
+            ? item(name, "skipped", "Skill directory does not exist.")
+            : item(name, "failed", "Skill directory could not be inspected.");
+    }
+    if (root.isSymbolicLink())
+        return item(name, "retained", "Skill directory is a symbolic link.");
+    if (root.isDirectory?.() !== true)
+        return item(name, "retained", "Skill path is not a directory.");
+    const manifestPath = join(path, "SKILL.md");
+    try {
+        const manifest = await fileSystem.stat(manifestPath);
+        if (manifest.isSymbolicLink())
+            return item(name, "retained", "Skill manifest is a symbolic link.");
+        if (manifest.isFile?.() !== true)
+            return item(name, "retained", "Skill manifest is not a regular file.");
+    }
+    catch (cause) {
+        return isMissing(cause)
+            ? item(name, "retained", "Skill ownership could not be established.")
+            : item(name, "failed", "Skill manifest could not be inspected.");
+    }
+    let content;
+    try {
+        content = await (fileSystem.readRegularText?.(manifestPath) ??
+            fileSystem.readText(manifestPath));
+    }
+    catch (cause) {
+        return isMissing(cause)
+            ? item(name, "retained", "Skill ownership could not be established.")
+            : item(name, "failed", "Skill manifest could not be read.");
+    }
+    if (!isManagedSkillManifest(content))
+        return item(name, "retained", "Skill manifest is not REA-owned.");
+    const manifestName = "SKILL.md";
+    const otherFiles = MANAGED_SKILL_FILES.filter((relativePath) => relativePath !== manifestName);
+    const results = [];
+    for (const relativePath of otherFiles)
+        results.push(await removeManagedSkillFile(path, relativePath, name, fileSystem));
+    if (results.some(({ status }) => status === "failed" || status === "retained"))
+        results.push(item(name, "retained", "REA ownership manifest was retained because a managed file could not be safely removed."));
+    else
+        results.push(await removeManagedSkillFile(path, manifestName, name, fileSystem));
+    const failed = results.find(({ status }) => status === "failed");
+    if (failed !== undefined)
+        return item(name, "failed", results.map(({ detail }) => detail).join(" "));
+    const removed = results.some(({ status }) => status === "removed");
+    return item(name, removed ? "removed" : "skipped", "REA-managed skill files were removed; other files were preserved.");
+};
+const removeManagedSkillFile = async (root, relativePath, name, fileSystem) => {
+    const segments = relativePath.split(/[\\/]/u);
+    let parent = root;
+    for (const segment of segments.slice(0, -1)) {
+        parent = join(parent, segment);
+        try {
+            const stats = await fileSystem.stat(parent);
+            if (stats.isSymbolicLink() || stats.isDirectory?.() !== true)
+                return item(name, "retained", `Managed path parent was retained: ${parent}.`);
+        }
+        catch (cause) {
+            return isMissing(cause)
+                ? item(name, "skipped", `${join(parent, segments.at(-1) ?? "")} does not exist.`)
+                : item(name, "failed", `Managed path parent could not be inspected: ${parent}.`);
+        }
+    }
+    const target = join(root, relativePath);
+    let stats;
+    try {
+        stats = await fileSystem.stat(target);
+    }
+    catch (cause) {
+        return isMissing(cause)
+            ? item(name, "skipped", `${target} does not exist.`)
+            : item(name, "failed", `Managed file could not be inspected: ${target}.`);
+    }
+    if (stats.isSymbolicLink())
+        return item(name, "retained", `Managed file is a symbolic link: ${target}.`);
+    if (stats.isFile?.() !== true)
+        return item(name, "retained", `Managed path is not a regular file: ${target}.`);
+    try {
+        await fileSystem.remove(target, false);
+        return item(name, "removed", `Removed ${target}.`);
+    }
+    catch (cause) {
+        return isMissing(cause)
+            ? item(name, "skipped", `${target} does not exist.`)
+            : item(name, "failed", `Managed file could not be removed: ${target}.`);
+    }
+};
 const item = (name, status, detail) => ({ name, status, detail });
+/**
+ * Layered clients are removed file by file, but callers look up one status by
+ * client name. A missing earlier file must not hide a later removal.
+ */
+const collapseUninstallItems = (items) => {
+    const collapsed = [];
+    for (const next of items) {
+        const index = collapsed.findIndex(({ name }) => name === next.name);
+        const current = collapsed[index];
+        if (current === undefined) {
+            collapsed.push(next);
+            continue;
+        }
+        collapsed[index] = mergeUninstallItems(current, next);
+    }
+    return collapsed;
+};
+const mergeUninstallItems = (current, next) => {
+    const status = preferredUninstallStatus(current.status, next.status);
+    const details = [current, next]
+        .filter((entry) => entry.status === status ||
+        (status === "removed" && entry.status === "retained"))
+        .map(({ detail }) => detail);
+    return item(current.name, status, [...new Set(details)].join(" "));
+};
+const preferredUninstallStatus = (current, next) => uninstallStatusPriority(next) > uninstallStatusPriority(current)
+    ? next
+    : current;
+const uninstallStatusPriority = (status) => {
+    switch (status) {
+        case "failed":
+            return 3;
+        case "removed":
+            return 2;
+        case "retained":
+            return 1;
+        case "skipped":
+            return 0;
+        default: {
+            const exhaustive = status;
+            throw new TypeError(`Unhandled uninstall item status: ${String(exhaustive)}`);
+        }
+    }
+};
 const registrationSchema = z
     .object({ command: z.string(), args: z.array(z.string()) })
     .passthrough();