@paradigma-inc/flywheel 0.1.13 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paradigma-inc/flywheel",
-  "version": "0.1.13",
+  "version": "0.1.16",
   "description": "One-command setup for Flywheel MCP hosts",
   "type": "module",
   "files": [

package/skills/flywheel/SKILL.md

@@ -50,3 +50,9 @@ Choose one primary file first, then add at most one supporting file only if need
 - Prefer concrete steps and decision points over long narrative explanations.
 - Do not run broad document reads; load only what is required by the current request.
 - Do not start compute-heavy execution before design intent is clear.
+- For managed compute cleanup in autonomous runs, default to releasing only
+  known leases (leases acquired in the current run or explicitly selected by
+  the user).
+- When unknown active leases are present, report and skip by default.
+- Use account-wide release (`flywheel_compute_release_all`) only when the user
+  explicitly asks for account-wide cleanup.

package/skills/flywheel/compute/managed-compute.md

@@ -17,6 +17,11 @@ Flywheel can provision managed GPU instances for you from providers like Lambda
 3. **The agent handles the rest.** It acquires a machine, waits for it to become ready, and gets SSH access automatically. Provisioning typically takes a few minutes — the agent polls for readiness in the background.
 4. **Release when done.** When you're finished, the agent releases the lease. You can also release leases from the WebUI at any time.
 
+For autonomous runs, agents should default to releasing only known leases
+(leases acquired in the current run or explicitly selected by the user). If
+unknown active leases are detected, agents should report and skip those leases
+by default. Use account-wide release only when the user explicitly requests it.
+
 ## [](https://flywheel.paradigma.inc//#managing-machines-in-the-webui)Managing machines in the WebUI
 
 In **Settings > Machines**, you can see all GPU leases across your account — including the provider, state, hourly rate, total spend, and the acquire context that originally launched each lease. You can release individual leases or all at once.

package/skills/flywheel-auto/SKILL.md

@@ -84,7 +84,9 @@ Before execution, recover or establish these inputs:
    - Spawn up to `k` workers for distinct executable frontier nodes.
    - Route additional viable branches sequentially when there are more than `k` worthwhile directions.
    - After each resolved node, refresh the lookahead so the graph remains `n` hops ahead.
-   - Release managed compute with `flywheel_compute_release` or `flywheel_compute_release_all` when a branch is done.
+   - Release managed compute when a branch is done. Default to releasing only
+     known leases. Use `flywheel_compute_release_all` only when the user
+     explicitly requests account-wide cleanup.
    - Stop only when the graph-local terminal condition says to stop, such as: objective met, budget exhausted, or no non-redundant frontier branch is likely to produce enough decision-relevant information to justify the remaining budget and duplication risk.
 9. Commit after the node snapshot is coherent with `flywheel_commit_node`.
    - Commit resolved insight nodes only when they have non-empty `insights`.

package/skills/flywheel-auto/evals/evals.json

@@ -1,19 +1,19 @@
 [
   {
     "id": "continuation-from-existing-frontier",
-    "prompt": "Use $flywheel-auto at /Users/g.f.g.f./Documents/GitHub/paradigma/project/flywheel-setup/skills/flywheel-auto to continue a Flywheel frontier that already has a persisted control node. Keep going under the existing credit cap and do not ask again for the objective or budget unless the control node is missing or contradictory.",
+    "prompt": "Use $flywheel-auto to continue a Flywheel frontier that already has a persisted control node. Keep going under the existing credit cap and do not ask again for the objective or budget unless the control node is missing or contradictory.",
     "expected_output": "Read the persisted contract from the control node content before replanning, continue from that stored objective and budget, avoid re-asking for the objective or budget when the control node is coherent, and leave behind an updated control node plus staged or committed frontier work.",
     "files": []
   },
   {
     "id": "cold-start-with-non-credit-budget",
-    "prompt": "Use $flywheel-auto at /Users/g.f.g.f./Documents/GitHub/paradigma/project/flywheel-setup/skills/flywheel-auto to explore this frontier autonomously with at most $25 of managed-compute spend. Persist the dollar-denominated cap verbatim and derive whatever operational compute approval cap is needed before acquisition.",
+    "prompt": "Use $flywheel-auto to explore this frontier autonomously with at most $25 of managed-compute spend. Persist the dollar-denominated cap verbatim and derive whatever operational compute approval cap is needed before acquisition.",
     "expected_output": "Persist the dollar-denominated budget ceiling and unit verbatim in the control node, derive an operational compute approval cap before acquisition, record both values before any compute request is made, and leave a coherent run contract behind for later continuation.",
     "files": []
   },
   {
     "id": "cold-start-with-no-objective",
-    "prompt": "Use $flywheel-auto at /Users/g.f.g.f./Documents/GitHub/paradigma/project/flywheel-setup/skills/flywheel-auto to go autonomous on this Flywheel graph until you find something interesting. If I refuse to specify an objective, infer one from the graph context and make it explicit before you execute.",
+    "prompt": "Use $flywheel-auto to go autonomous on this Flywheel graph until you find something interesting. If I refuse to specify an objective, infer one from the graph context and make it explicit before you execute.",
     "expected_output": "Ask for an objective first, infer one from graph context if the user refuses, write that objective explicitly into the control node, and only then proceed toward execution with a coherent control node and frontier plan.",
     "files": []
   }

package/skills/flywheel-auto/references/INTERFACES.md

@@ -2,7 +2,7 @@
 
 Canonical reference for Flywheel user-facing interfaces and public contracts.
 
-Last updated: 2026-03-21
+Last updated: 2026-04-08
 
 ## Primary Clients
 
@@ -19,7 +19,8 @@ All interfaces operate on the same core entities:
 - artifact
 - execution
 - compute lease
-- budget grant
+- compute budget
+- compute grant (session-scoped)
 
 Node snapshots are the canonical durable contract for resume, review, and
 cross-client interoperability.
@@ -69,11 +70,12 @@ cross-client interoperability.
 - `GET /mcp/compute/connection`
 - `POST /mcp/compute/release`
 - `POST /mcp/compute/release-all`
-- `GET /mcp/nodes/{node_id}/budget/grants`
-- `GET /mcp/nodes/{node_id}/budget/campaign-grants`
-- `POST /mcp/nodes/{node_id}/budget/campaign-grants`
-- `PATCH /mcp/nodes/{node_id}/budget/campaign-grants/{budget_grant_id}`
-- `DELETE /mcp/nodes/{node_id}/budget/campaign-grants/{budget_grant_id}`
+- `GET /mcp/compute/grants`
+- `GET /mcp/nodes/{node_id}/budgets`
+- `GET /mcp/nodes/{root_node_id}/campaign-budgets`
+- `POST /mcp/nodes/{root_node_id}/campaign-budgets`
+- `PATCH /mcp/nodes/{root_node_id}/campaign-budgets/{compute_budget_id}`
+- `DELETE /mcp/nodes/{root_node_id}/campaign-budgets/{compute_budget_id}`
 
 ### Sharing, tags, and audit
 

package/skills/flywheel-lookahead/references/INTERFACES.md

@@ -2,7 +2,7 @@
 
 Canonical reference for Flywheel user-facing interfaces and public contracts.
 
-Last updated: 2026-03-21
+Last updated: 2026-04-08
 
 ## Primary Clients
 
@@ -19,7 +19,8 @@ All interfaces operate on the same core entities:
 - artifact
 - execution
 - compute lease
-- budget grant
+- compute budget
+- compute grant (session-scoped)
 
 Node snapshots are the canonical durable contract for resume, review, and
 cross-client interoperability.
@@ -69,11 +70,12 @@ cross-client interoperability.
 - `GET /mcp/compute/connection`
 - `POST /mcp/compute/release`
 - `POST /mcp/compute/release-all`
-- `GET /mcp/nodes/{node_id}/budget/grants`
-- `GET /mcp/nodes/{node_id}/budget/campaign-grants`
-- `POST /mcp/nodes/{node_id}/budget/campaign-grants`
-- `PATCH /mcp/nodes/{node_id}/budget/campaign-grants/{budget_grant_id}`
-- `DELETE /mcp/nodes/{node_id}/budget/campaign-grants/{budget_grant_id}`
+- `GET /mcp/compute/grants`
+- `GET /mcp/nodes/{node_id}/budgets`
+- `GET /mcp/nodes/{root_node_id}/campaign-budgets`
+- `POST /mcp/nodes/{root_node_id}/campaign-budgets`
+- `PATCH /mcp/nodes/{root_node_id}/campaign-budgets/{compute_budget_id}`
+- `DELETE /mcp/nodes/{root_node_id}/campaign-budgets/{compute_budget_id}`
 
 ### Sharing, tags, and audit
 

package/skills/flywheel-reproduce/SKILL.md

@@ -80,7 +80,9 @@ Before execution, recover or establish these inputs:
    - Prefer explicit validation branches such as baseline checks, mechanism or intermediate-signal checks, ablations, efficiency checks, robustness checks, failure analysis, and follow-up analysis branches after results land.
    - If the branch can run through Flywheel execution directly, use `flywheel_launch_execution` and inspect terminal status before commit.
    - If the branch needs managed compute, use `flywheel_request_compute_grant_approval`, resolve the approved `compute_grant_id` with `flywheel_list_compute_grants` or `flywheel_list_approval_sessions`, then `flywheel_compute_acquire`, poll `flywheel_compute_status`, and use `flywheel_compute_connection` when the lease is ready.
-   - Release managed compute with `flywheel_compute_release` or `flywheel_compute_release_all` when a branch is done.
+   - Release managed compute when a branch is done. Default to releasing only
+     known leases. Use `flywheel_compute_release_all` only when the user
+     explicitly requests account-wide cleanup.
    - Stop when the core claim is resolved or the budget ceiling is reached.
 9. Commit after the node snapshot is coherent with `flywheel_commit_node`.
    - Commit resolved insight nodes only when they have non-empty `insights`.

package/skills/flywheel-reproduce/references/INTERFACES.md

@@ -2,7 +2,7 @@
 
 Canonical reference for Flywheel user-facing interfaces and public contracts.
 
-Last updated: 2026-03-21
+Last updated: 2026-04-08
 
 ## Primary Clients
 
@@ -19,7 +19,8 @@ All interfaces operate on the same core entities:
 - artifact
 - execution
 - compute lease
-- budget grant
+- compute budget
+- compute grant (session-scoped)
 
 Node snapshots are the canonical durable contract for resume, review, and
 cross-client interoperability.
@@ -69,11 +70,12 @@ cross-client interoperability.
 - `GET /mcp/compute/connection`
 - `POST /mcp/compute/release`
 - `POST /mcp/compute/release-all`
-- `GET /mcp/nodes/{node_id}/budget/grants`
-- `GET /mcp/nodes/{node_id}/budget/campaign-grants`
-- `POST /mcp/nodes/{node_id}/budget/campaign-grants`
-- `PATCH /mcp/nodes/{node_id}/budget/campaign-grants/{budget_grant_id}`
-- `DELETE /mcp/nodes/{node_id}/budget/campaign-grants/{budget_grant_id}`
+- `GET /mcp/compute/grants`
+- `GET /mcp/nodes/{node_id}/budgets`
+- `GET /mcp/nodes/{root_node_id}/campaign-budgets`
+- `POST /mcp/nodes/{root_node_id}/campaign-budgets`
+- `PATCH /mcp/nodes/{root_node_id}/campaign-budgets/{compute_budget_id}`
+- `DELETE /mcp/nodes/{root_node_id}/campaign-budgets/{compute_budget_id}`
 
 ### Sharing, tags, and audit
 

package/skills/flywheel-to-graph/references/INTERFACES.md

@@ -2,7 +2,7 @@
 
 Canonical reference for Flywheel user-facing interfaces and public contracts.
 
-Last updated: 2026-03-21
+Last updated: 2026-04-08
 
 ## Primary Clients
 
@@ -19,7 +19,8 @@ All interfaces operate on the same core entities:
 - artifact
 - execution
 - compute lease
-- budget grant
+- compute budget
+- compute grant (session-scoped)
 
 Node snapshots are the canonical durable contract for resume, review, and
 cross-client interoperability.
@@ -69,11 +70,12 @@ cross-client interoperability.
 - `GET /mcp/compute/connection`
 - `POST /mcp/compute/release`
 - `POST /mcp/compute/release-all`
-- `GET /mcp/nodes/{node_id}/budget/grants`
-- `GET /mcp/nodes/{node_id}/budget/campaign-grants`
-- `POST /mcp/nodes/{node_id}/budget/campaign-grants`
-- `PATCH /mcp/nodes/{node_id}/budget/campaign-grants/{budget_grant_id}`
-- `DELETE /mcp/nodes/{node_id}/budget/campaign-grants/{budget_grant_id}`
+- `GET /mcp/compute/grants`
+- `GET /mcp/nodes/{node_id}/budgets`
+- `GET /mcp/nodes/{root_node_id}/campaign-budgets`
+- `POST /mcp/nodes/{root_node_id}/campaign-budgets`
+- `PATCH /mcp/nodes/{root_node_id}/campaign-budgets/{compute_budget_id}`
+- `DELETE /mcp/nodes/{root_node_id}/campaign-budgets/{compute_budget_id}`
 
 ### Sharing, tags, and audit
 

package/src/cli.mjs

@@ -2,7 +2,7 @@ import { Command } from "commander";
 import { checkbox, confirm, select } from "@inquirer/prompts";
 import ora from "ora";
 import pc from "picocolors";
-import { rm } from "node:fs/promises";
+import { readFile, rm } from "node:fs/promises";
 import path from "node:path";
 import { randomBytes } from "node:crypto";
 
@@ -39,6 +39,8 @@ import {
   installBundledSkillForHosts,
   listBundledSkills,
   partitionInstallSkillHosts,
+  removeInstalledSkillsForHosts,
+  SUPPORTED_INSTALL_SKILL_HOSTS,
   resolveInstalledSkillDir,
   resolvePackageRoot,
 } from "./skill-installer.mjs";
@@ -751,6 +753,106 @@ function scopesFromUninstallScope(scope) {
   return scope === "all" ? ["global", "project"] : [scope];
 }
 
+function keyPath(configKey) {
+  return Array.isArray(configKey) ? configKey : [configKey];
+}
+
+function readConfigSection(config, configKey) {
+  const pathParts = keyPath(configKey);
+  let current = config && typeof config === "object" ? config : {};
+  for (const part of pathParts) {
+    if (
+      !current ||
+      typeof current !== "object" ||
+      Array.isArray(current) ||
+      !(part in current)
+    ) {
+      return {};
+    }
+    const next = current[part];
+    if (!next || typeof next !== "object" || Array.isArray(next)) {
+      return {};
+    }
+    current = next;
+  }
+  return current;
+}
+
+function parseTomlServerNames(tomlText) {
+  const serverNames = new Set();
+  for (const line of String(tomlText || "").replace(/\r\n/g, "\n").split("\n")) {
+    const match = line.trim().match(/^\[mcp_servers\.([A-Za-z0-9_-]+)\](?:\s*#.*)?$/);
+    if (!match) {
+      continue;
+    }
+    serverNames.add(match[1]);
+  }
+  return [...serverNames].sort();
+}
+
+function isLikelyFlywheelMcpUrl(url) {
+  if (typeof url !== "string" || url.trim().length === 0) {
+    return false;
+  }
+  try {
+    const parsed = new URL(url);
+    return parsed.pathname === "/mcp-server";
+  } catch {
+    return false;
+  }
+}
+
+async function listHostMcpEntries(hostName, scope) {
+  const host = getHost(hostName);
+  const filePath = await resolveMcpPath(mcpCandidatesForScope(host, scope));
+
+  if (host.mcp.configType === "toml") {
+    let raw = "";
+    try {
+      raw = await readFile(filePath, "utf8");
+    } catch {
+      return [];
+    }
+    const entries = [];
+    for (const serverName of parseTomlServerNames(raw)) {
+      // eslint-disable-next-line no-await-in-loop
+      const entry = await readTomlServerEntry(filePath, serverName);
+      if (!entry.exists) {
+        continue;
+      }
+      entries.push({
+        serverName,
+        url: typeof entry.url === "string" ? entry.url : null,
+      });
+    }
+    return entries;
+  }
+
+  const config =
+    host.mcp.configType === "yaml"
+      ? await readYamlConfig(filePath)
+      : await readJsonConfig(filePath);
+  const section = readConfigSection(config, host.mcp.configKey);
+  return Object.entries(section)
+    .filter(([, entry]) => entry && typeof entry === "object" && !Array.isArray(entry))
+    .map(([serverName, entry]) => ({
+      serverName,
+      url: typeof entry.url === "string" ? entry.url : null,
+    }));
+}
+
+async function resolveHostsWithRemainingFlywheelMcpEntries({ scope }) {
+  const remainingHosts = [];
+  for (const hostName of SUPPORTED_INSTALL_SKILL_HOSTS) {
+    // eslint-disable-next-line no-await-in-loop
+    const hostEntries = await listHostMcpEntries(hostName, scope).catch(() => []);
+    if (hostEntries.some((entry) => isLikelyFlywheelMcpUrl(entry.url))) {
+      remainingHosts.push(hostName);
+    }
+  }
+  return remainingHosts;
+}
+
 async function isConfiguredForUninstallScope(hostName, scope, serverName) {
   const scopes = scopesFromUninstallScope(scope);
   for (const singleScope of scopes) {
@@ -907,26 +1009,118 @@ async function runUninstallCommand(options) {
   const { scope, hosts } = resolved;
   const scopes = scopesFromUninstallScope(scope);
 
-  const spinner = ora("Removing Flywheel MCP entries...").start();
-  const results = [];
+  const mcpSpinner = ora("Removing Flywheel MCP entries...").start();
+  const mcpResults = [];
   for (const singleScope of scopes) {
     for (const host of hosts) {
-      spinner.text = `Removing from ${getHost(host).displayName} (${singleScope})...`;
+      mcpSpinner.text = `Removing from ${getHost(host).displayName} (${singleScope})...`;
       // eslint-disable-next-line no-await-in-loop
-      results.push(await removeHostConfig(host, singleScope, serverName));
+      mcpResults.push(await removeHostConfig(host, singleScope, serverName));
+    }
+  }
+  mcpSpinner.succeed("MCP uninstall complete");
+
+  const { supportedHosts, unsupportedHosts } =
+    partitionInstallSkillHosts(hosts);
+  const bundledSkillResults = [];
+  let bundledSkillNames = [];
+
+  if (supportedHosts.length > 0) {
+    const packageRoot = resolvePackageRoot();
+    bundledSkillNames = await listBundledSkills(packageRoot);
+    if (bundledSkillNames.length > 0) {
+      const skillSpinner = ora("Removing Flywheel bundled skills...").start();
+      for (const singleScope of scopes) {
+        // Prevent deleting shared skill directories while non-selected hosts
+        // mapped to the same location still have Flywheel MCP entries.
+        // eslint-disable-next-line no-await-in-loop
+        const configuredRetainHostNames = await resolveHostsWithRemainingFlywheelMcpEntries({
+          scope: singleScope,
+        });
+        skillSpinner.text = `Removing bundled skills from ${supportedHosts.length} host(s) (${singleScope})...`;
+        // eslint-disable-next-line no-await-in-loop
+        bundledSkillResults.push(
+          ...(await removeInstalledSkillsForHosts({
+            projectRoot: process.cwd(),
+            hostNames: supportedHosts,
+            retainHostNames: configuredRetainHostNames,
+            scope: singleScope,
+            skillNames: bundledSkillNames,
+          })),
+        );
+      }
+      skillSpinner.succeed("Bundled skill uninstall complete");
     }
   }
-  spinner.succeed("Uninstall complete");
 
   log.blank();
-  log.plain(pc.green("✔ Flywheel uninstall complete"));
+  log.plain(pc.green("✔ Flywheel uninstall complete (MCP entries and bundled skills)"));
   log.blank();
-  for (const result of results) {
+  for (const result of mcpResults) {
     const icon = result.status === "removed" ? pc.green("-") : pc.dim("~");
     log.plain(`  ${pc.bold(result.host)} ${pc.dim(`(${result.scope})`)}`);
     log.plain(`    ${icon} ${result.status}`);
     log.plain(`      ${pc.dim(result.filePath)}`);
   }
+
+  log.blank();
+  log.plain(`  ${pc.bold("Bundled skills")}`);
+  if (supportedHosts.length === 0) {
+    log.plain(`    ${pc.dim("~")} no skill-supporting hosts selected`);
+  } else if (bundledSkillNames.length === 0) {
+    log.plain(`    ${pc.dim("~")} no bundled skills found in this package`);
+  } else {
+    const groupedSkillResults = new Map();
+    for (const skillResult of bundledSkillResults) {
+      for (const hostName of skillResult.hostNames) {
+        const groupingKey = `${hostName}:${skillResult.scope}`;
+        const existingGroup = groupedSkillResults.get(groupingKey);
+        if (existingGroup) {
+          existingGroup.entries.push(skillResult);
+          continue;
+        }
+        groupedSkillResults.set(groupingKey, {
+          hostName,
+          scope: skillResult.scope,
+          entries: [skillResult],
+        });
+      }
+    }
+
+    const sortedGroups = [...groupedSkillResults.values()].sort((left, right) => {
+      const leftKey = `${left.hostName}:${left.scope}`;
+      const rightKey = `${right.hostName}:${right.scope}`;
+      return leftKey.localeCompare(rightKey);
+    });
+    for (const groupedResult of sortedGroups) {
+      log.plain(
+        `  ${pc.bold(getHost(groupedResult.hostName).displayName)} ${pc.dim(`(${groupedResult.scope})`)}`,
+      );
+      for (const entry of groupedResult.entries) {
+        const icon =
+          entry.status === "removed"
+            ? pc.green("-")
+            : entry.status === "retained"
+              ? pc.yellow("~")
+              : pc.dim("~");
+        const retainedSuffix =
+          entry.status === "retained" && Array.isArray(entry.retainedHostNames)
+            ? ` (shared with configured host(s): ${entry.retainedHostNames.join(", ")})`
+            : "";
+        log.plain(`    ${icon} ${entry.status}${retainedSuffix}: ${entry.skillNames.join(", ")}`);
+        log.plain(`      ${pc.dim(entry.installedSkillDir)}`);
+      }
+    }
+  }
+
+  for (const unsupportedHostName of unsupportedHosts) {
+    for (const singleScope of scopes) {
+      log.plain(
+        `  ${pc.bold(getHost(unsupportedHostName).displayName)} ${pc.dim(`(${singleScope})`)}`,
+      );
+      log.plain(`    ${pc.dim("~")} skill uninstall not supported (MCP-only host)`);
+    }
+  }
   log.blank();
 }
 
@@ -986,7 +1180,7 @@ Examples:
 
   program
     .command("uninstall")
-    .description("Remove Flywheel MCP entries from host configs")
+    .description("Remove Flywheel MCP entries and bundled skills from selected hosts")
     .option("--claude", "Uninstall for Claude Code")
     .option("--opencode", "Uninstall for OpenCode")
     .option("--codex", "Uninstall for Codex")

package/src/skill-installer.mjs

@@ -397,6 +397,90 @@ export async function installBundledSkillForHosts({
   }
 }
 
+export async function removeInstalledSkillsForHosts({
+  projectRoot = process.cwd(),
+  hostNames = [],
+  retainHostNames = [],
+  scope = "project",
+  skillNames,
+} = {}) {
+  const normalizedScope = normalizeInstallScope(scope);
+  const normalizedSkillNames = normalizeBundledSkillNames(skillNames);
+  const normalizedRetainHostNames = uniqueValues(retainHostNames);
+  const removalTargetsByPath = new Map();
+  const retainedTargetsByPath = new Map();
+
+  for (const hostName of uniqueValues(hostNames)) {
+    for (const skillName of normalizedSkillNames) {
+      const installedSkillDir = resolveInstalledSkillDir(
+        projectRoot,
+        hostName,
+        normalizedScope,
+        skillName,
+      );
+      const existingTarget = removalTargetsByPath.get(installedSkillDir);
+      if (existingTarget) {
+        existingTarget.hostNames.add(hostName);
+        existingTarget.skillNames.add(skillName);
+        continue;
+      }
+      removalTargetsByPath.set(installedSkillDir, {
+        installedSkillDir,
+        hostNames: new Set([hostName]),
+        skillNames: new Set([skillName]),
+      });
+    }
+  }
+
+  for (const hostName of normalizedRetainHostNames) {
+    for (const skillName of normalizedSkillNames) {
+      const installedSkillDir = resolveInstalledSkillDir(
+        projectRoot,
+        hostName,
+        normalizedScope,
+        skillName,
+      );
+      const existingRetainedTarget = retainedTargetsByPath.get(installedSkillDir);
+      if (existingRetainedTarget) {
+        existingRetainedTarget.hostNames.add(hostName);
+        continue;
+      }
+      retainedTargetsByPath.set(installedSkillDir, {
+        hostNames: new Set([hostName]),
+      });
+    }
+  }
+
+  const removalResults = [];
+  for (const removalTarget of [...removalTargetsByPath.values()].sort((left, right) =>
+    left.installedSkillDir.localeCompare(right.installedSkillDir),
+  )) {
+    const hadInstalledSkillDir = await pathExists(removalTarget.installedSkillDir);
+    const retainedTarget = retainedTargetsByPath.get(removalTarget.installedSkillDir);
+    if (retainedTarget) {
+      removalResults.push({
+        scope: normalizedScope,
+        installedSkillDir: removalTarget.installedSkillDir,
+        hostNames: [...removalTarget.hostNames].sort(),
+        retainedHostNames: [...retainedTarget.hostNames].sort(),
+        skillNames: [...removalTarget.skillNames].sort(),
+        status: hadInstalledSkillDir ? "retained" : "not present",
+      });
+      continue;
+    }
+    await rm(removalTarget.installedSkillDir, { recursive: true, force: true });
+    removalResults.push({
+      scope: normalizedScope,
+      installedSkillDir: removalTarget.installedSkillDir,
+      hostNames: [...removalTarget.hostNames].sort(),
+      skillNames: [...removalTarget.skillNames].sort(),
+      status: hadInstalledSkillDir ? "removed" : "not present",
+    });
+  }
+
+  return removalResults;
+}
+
 async function rewriteOpenAiAgentMetadataMcpTarget({
   skillDir,
   serverName,