@paradigma-inc/flywheel 0.1.52 → 0.1.60

package/src/skill-installer.mjs

@@ -1,3 +1,4 @@
+import { SKILL_ONLY_HOST_NAMES } from "./agents.mjs";
 import { execFile as execFileCb } from "node:child_process";
 import { existsSync } from "node:fs";
 import {
@@ -35,6 +36,12 @@ export const INSTALL_SKILLS_AGENT_BY_HOST = Object.freeze({
   "pi-mono": "pi",
 });
 
+// Hosts that install skills via a direct filesystem copy (no `skills add`
+// agent integration). These are mostly skill-only targets — they do not write
+// any MCP config or agent-specific AGENTS.md; Flywheel just drops its bundled
+// skills under a conventional directory the IDE or toolchain reads.
+export const DIRECT_COPY_SKILL_HOSTS = Object.freeze(["gemini", "universal", "antigravity"]);
+
 export const SUPPORTED_INSTALL_SKILL_HOSTS = Object.freeze([
   "codex",
   "claude",
@@ -42,6 +49,9 @@ export const SUPPORTED_INSTALL_SKILL_HOSTS = Object.freeze([
   "cursor",
   "openclaw",
   "pi-mono",
+  "gemini",
+  "universal",
+  "antigravity",
 ]);
 
 export function resolvePackageRoot(moduleUrl = import.meta.url) {
@@ -168,7 +178,10 @@ export function partitionInstallSkillHosts(hostNames) {
   const unsupportedHosts = [];
 
   for (const hostName of uniqueValues(hostNames)) {
-    if (hostName in INSTALL_SKILLS_AGENT_BY_HOST) {
+    if (
+      hostName in INSTALL_SKILLS_AGENT_BY_HOST ||
+      DIRECT_COPY_SKILL_HOSTS.includes(hostName)
+    ) {
       supportedHosts.push(hostName);
     } else {
       unsupportedHosts.push(hostName);
@@ -178,6 +191,58 @@ export function partitionInstallSkillHosts(hostNames) {
   return { supportedHosts, unsupportedHosts };
 }
 
+export function isDirectCopySkillHost(hostName) {
+  return DIRECT_COPY_SKILL_HOSTS.includes(hostName);
+}
+
+/**
+ * Resolve the path of the "Flywheel installed its skills here on behalf of
+ * <hostName>" ownership marker file. The marker lives at the parent of the
+ * bundled skill dirs (i.e. the skills root for that host), so it is not
+ * touched by agent-level skill installers that operate on individual skill
+ * subdirectories.
+ *
+ * The marker carries two related load-bearing signals, resolved by caller
+ * context:
+ *
+ *   1. For pure skill-only hosts (`universal`, `antigravity`): the marker
+ *      is the ONLY ownership signal — these hosts write no MCP entry. An
+ *      uninstall of another host sharing the same skills-root uses it to
+ *      decide whether to retain those skill dirs.
+ *
+ *   2. For MCP-capable hosts installed through `runCliSetupMode` (which
+ *      writes skills + runtime config but NO MCP entry): the marker is the
+ *      per-host signal that this host was installed in CLI mode. Without
+ *      it, a subsequent `setup --mode mcp --<host>` could not tell whether
+ *      shared-root artifacts came from a real CLI install of this host or
+ *      from an unrelated skill-only install at the same root, so it would
+ *      silently skip the cross-mode conflict guard. MCP-capable hosts
+ *      installed via the MCP path (with or without `--install-skill`) do
+ *      NOT get a marker — their MCP entry is the canonical signal there.
+ *
+ * The marker file is host-scoped (embedded in the filename) so multiple
+ * hosts sharing the same skills-root can co-own it without collisions.
+ */
+export function resolveFlywheelInstalledMarkerPath(projectRoot, hostName, scope) {
+  if (!SUPPORTED_INSTALL_SKILL_HOSTS.includes(hostName)) {
+    throw new Error(
+      `resolveFlywheelInstalledMarkerPath requires a host that uses the flywheel skill installer; got '${hostName}'.`,
+    );
+  }
+  const normalizedScope = normalizeInstallScope(scope);
+  // Reuse resolveInstalledSkillDir with a placeholder skill name to get the
+  // scope/host-specific skills-root directory; the marker file lives at that
+  // root, next to (not inside) the individual skill dirs.
+  const placeholderSkillDir = resolveInstalledSkillDir(
+    projectRoot,
+    hostName,
+    normalizedScope,
+    "__placeholder__",
+  );
+  const skillsRoot = path.dirname(placeholderSkillDir);
+  return path.join(skillsRoot, `.flywheel-installed-by-${hostName}`);
+}
+
 export function resolveInstalledSkillDir(
   projectRoot,
   hostName,
@@ -208,6 +273,12 @@ export function resolveInstalledSkillDir(
         return path.join(root, ".pi", "agent", "skills", normalizedSkillName);
       }
       return path.join(root, ".pi", "skills", normalizedSkillName);
+    case "gemini":
+      return path.join(root, ".gemini", "skills", normalizedSkillName);
+    case "universal":
+      return path.join(root, ".agents", "skills", normalizedSkillName);
+    case "antigravity":
+      return path.join(root, ".agent", "skills", normalizedSkillName);
     default:
       throw new Error(`--install-skill is not supported for host '${hostName}'.`);
   }
@@ -321,15 +392,61 @@ export async function inspectInstalledSkillArtifactsForHosts({
     skillStates.set(skillName, skillState);
   }
 
+  // Capture pre-install presence of every relevant install marker so a
+  // rollback can restore the exact state the filesystem was in before this
+  // install attempt. Without this, a failure after a marker write leaves
+  // stale ownership state — and later uninstalls of other hosts retain
+  // shared skill dirs that were never actually claimed, or the cross-mode
+  // conflict guard flips for a host that was never really installed. Every
+  // host that uses the flywheel skill installer is tracked here because
+  // the install may write a marker for any of them depending on call
+  // context; markers we never wrote simply stay absent.
+  const skillOnlyHostMarkers = new Map();
+  for (const hostName of uniqueValues(hostNames)) {
+    if (!SUPPORTED_INSTALL_SKILL_HOSTS.includes(hostName)) continue;
+    const markerPath = resolveFlywheelInstalledMarkerPath(
+      projectRoot,
+      hostName,
+      normalizedScope,
+    );
+    // eslint-disable-next-line no-await-in-loop
+    const hadMarker = await pathExists(markerPath);
+    skillOnlyHostMarkers.set(hostName, {
+      markerPath,
+      hadMarker,
+    });
+  }
+
   return {
     backupRoot,
     skillStates,
     skillsLockPath,
     hadSkillsLock,
     skillsLockContents,
+    skillOnlyHostMarkers,
   };
 }
 
+/**
+ * Install Flywheel's bundled skills into each selected host's conventional
+ * skill directory.
+ *
+ * `cliMode` toggles the ownership-marker policy to match the caller's
+ * install semantics:
+ *
+ *   - `cliMode: false` (default, MCP setup path): write an install marker
+ *     ONLY for pure skill-only hosts, because MCP-capable hosts advertise
+ *     their install via the MCP config entry written elsewhere in the MCP
+ *     flow. Writing a marker for them here would over-report ownership and
+ *     break legitimate cross-mode conflict detection.
+ *
+ *   - `cliMode: true` (CLI setup path): write an install marker for EVERY
+ *     host passed in. The CLI setup path does not write any MCP config, so
+ *     without a per-host marker, a subsequent MCP-mode setup cannot tell
+ *     whether a shared-root skill dir belongs to this host's CLI install
+ *     or to some other skill-only install at the same root, and its
+ *     cross-mode conflict guard silently fails open.
+ */
 export async function installBundledSkillForHosts({
   projectRoot = process.cwd(),
   hostNames = [],
@@ -337,6 +454,7 @@ export async function installBundledSkillForHosts({
   serverName = DEFAULT_SKILL_MCP_SERVER_NAME,
   serverUrl = DEFAULT_SKILL_MCP_SERVER_URL,
   skillNames,
+  cliMode = false,
 } = {}) {
   const packageRoot = resolvePackageRoot();
   const skillsCliPath = resolveSkillsCliPath(packageRoot);
@@ -370,6 +488,36 @@ export async function installBundledSkillForHosts({
 
     try {
       for (const hostName of uniqueValues(hostNames)) {
+        // Skill-only hosts always get the ownership marker; MCP-capable
+        // hosts only get it when the caller is the CLI setup path (see the
+        // docstring on installBundledSkillForHosts for rationale).
+        const shouldWriteMarker =
+          SKILL_ONLY_HOST_NAMES.includes(hostName) || cliMode === true;
+
+        if (isDirectCopySkillHost(hostName)) {
+          const destinationDir = resolveInstalledSkillDir(
+            projectRoot,
+            hostName,
+            normalizedScope,
+            skillName,
+          );
+          // eslint-disable-next-line no-await-in-loop
+          await rm(destinationDir, { force: true, recursive: true });
+          // eslint-disable-next-line no-await-in-loop
+          await mkdir(path.dirname(destinationDir), { recursive: true });
+          // eslint-disable-next-line no-await-in-loop
+          await cp(installSkillSourceDir, destinationDir, { recursive: true });
+          if (shouldWriteMarker) {
+            const markerPath = resolveFlywheelInstalledMarkerPath(
+              projectRoot,
+              hostName,
+              normalizedScope,
+            );
+            // eslint-disable-next-line no-await-in-loop
+            await writeFile(markerPath, "", { encoding: "utf8", mode: 0o600 });
+          }
+          continue;
+        }
         const agentName = resolveSkillsAgentName(hostName);
         const addArgs = [
           skillsCliPath,
@@ -388,6 +536,19 @@ export async function installBundledSkillForHosts({
           cwd: projectRoot,
           env: process.env,
         });
+        if (shouldWriteMarker) {
+          // CLI-mode install of an MCP-capable host writes no MCP entry;
+          // the marker is the per-host signal prior-mode detection uses
+          // to distinguish a real CLI install from artifacts left by an
+          // unrelated skill-only install at the same shared skills-root.
+          const markerPath = resolveFlywheelInstalledMarkerPath(
+            projectRoot,
+            hostName,
+            normalizedScope,
+          );
+          // eslint-disable-next-line no-await-in-loop
+          await writeFile(markerPath, "", { encoding: "utf8", mode: 0o600 });
+        }
       }
     } finally {
       if (stagedSkillSourceRoot) {
@@ -620,6 +781,23 @@ export async function cleanupInstalledSkillArtifactsForHosts({
     await rm(resolveProjectSkillsLockPath(projectRoot), { force: true });
   }
 
+  // Restore the direct-copy host ownership markers to their pre-install
+  // state. When a marker existed before this install (idempotent re-run),
+  // the marker file is an empty content-less file so simply leaving it in
+  // place is correct; but when the install added the marker for the first
+  // time and then failed, we must remove it to avoid false retention on
+  // subsequent uninstalls.
+  const markerEntries =
+    priorState?.skillOnlyHostMarkers instanceof Map
+      ? [...priorState.skillOnlyHostMarkers.values()]
+      : [];
+  for (const { markerPath, hadMarker } of markerEntries) {
+    if (!hadMarker) {
+      // eslint-disable-next-line no-await-in-loop
+      await rm(markerPath, { force: true });
+    }
+  }
+
   if (priorState?.backupRoot) {
     await rm(priorState.backupRoot, { force: true, recursive: true });
   }

package/src/unified-cli.mjs

@@ -1,7 +1,14 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
 import { runCli as runSetupCli } from "./cli.mjs";
 import { runRuntimeCli } from "./runtime/delegate.mjs";
 import { RUNTIME_ALIASES } from "./runtime/vendor/flywheel-cli-dist/commands/aliases.js";
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const PACKAGE_JSON_PATH = path.resolve(__dirname, "..", "package.json");
+
 const ALIAS_RESERVED_COMMANDS = new Set([
   "setup",
   "uninstall",
@@ -9,6 +16,7 @@ const ALIAS_RESERVED_COMMANDS = new Set([
   "--help",
   "-h",
 ]);
+const VERSION_REQUEST_TOKENS = new Set(["--version", "-v", "version"]);
 
 const HELP_EXTRAS = [
   {
@@ -49,6 +57,30 @@ function stripFormatTokens(argv) {
   return out;
 }
 
+let cachedPackageVersion = null;
+
+async function loadPackageVersion() {
+  if (cachedPackageVersion !== null) {
+    return cachedPackageVersion;
+  }
+  try {
+    const raw = await readFile(PACKAGE_JSON_PATH, "utf8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed.version === "string" && parsed.version.trim()) {
+      cachedPackageVersion = parsed.version.trim();
+      return cachedPackageVersion;
+    }
+  } catch {
+    // Fall through to deterministic fallback.
+  }
+  cachedPackageVersion = "0.0.0";
+  return cachedPackageVersion;
+}
+
+function isVersionRequest(argv) {
+  return argv.length === 1 && VERSION_REQUEST_TOKENS.has(argv[0]);
+}
+
 /**
  * Detect a top-level help invocation.
  *
@@ -104,6 +136,12 @@ export async function runUnifiedCli(argv = process.argv.slice(2)) {
     throw new Error("runUnifiedCli expects an argv array.");
   }
 
+  if (isVersionRequest(argv)) {
+    process.stdout.write(`${await loadPackageVersion()}\n`);
+    process.exitCode = 0;
+    return;
+  }
+
   if (isCombinedHelpRequest(argv)) {
     // Preserve any --format token verbatim so the runtime's format validator
     // runs and rejects unsupported values (e.g. `--format=badvalue`) with the

package/src/runtime/vendor/flywheel-cli-dist/commands/compute-policy-get.d.ts

@@ -1 +0,0 @@
-export declare const computePolicyGetCommand: import("./types.js").CommandHandler;

package/src/runtime/vendor/flywheel-cli-dist/commands/compute-policy-get.js

@@ -1,6 +0,0 @@
-import { buildHandler } from './handler-factory.js';
-export const computePolicyGetCommand = buildHandler({
-    method: 'GET',
-    pathTemplate: '/nodes/{node_id}/compute/policy',
-});
-//# sourceMappingURL=compute-policy-get.js.map

package/src/runtime/vendor/flywheel-cli-dist/commands/compute-policy-get.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"compute-policy-get.js","sourceRoot":"","sources":["../../src/commands/compute-policy-get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,CAAC,MAAM,uBAAuB,GAAG,YAAY,CAAC;IAClD,MAAM,EAAE,KAAK;IACb,YAAY,EAAE,iCAAiC;CAChD,CAAC,CAAC"}

package/src/runtime/vendor/flywheel-cli-dist/commands/compute-policy-set.d.ts

@@ -1,2 +0,0 @@
-import type { CommandHandler } from './types.js';
-export declare const computePolicySetCommand: CommandHandler;

package/src/runtime/vendor/flywheel-cli-dist/commands/compute-policy-set.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"compute-policy-set.js","sourceRoot":"","sources":["../../src/commands/compute-policy-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,CAAC,MAAM,uBAAuB,GAAmB,KAAK,EAAE,OAAO,EAAE,EAAE;IACvE,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzD,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1D,IAAI,GAAG,KAAK,SAAS;YAAE,SAAS;QAChC,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAClB,SAAS;QACX,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9E,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC,WAAW,CACxB,OAAO,EACP,UAAU,kBAAkB,CAAC,MAAM,CAAC,iBAAiB,EACrD,EAAE,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC"}

package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-audit-list.d.ts

@@ -1,2 +0,0 @@
-import type { CommandHandler } from './types.js';
-export declare const nodesAuditListCommand: CommandHandler;

package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-audit-list.js

@@ -1,7 +0,0 @@
-import { optionalInt, requiredString } from './utils.js';
-export const nodesAuditListCommand = async (context) => {
-    const nodeId = requiredString(context.params, 'node_id');
-    const limit = optionalInt(context.params, 'limit');
-    return context.requestJson('GET', `/nodes/${encodeURIComponent(nodeId)}/audit`, limit !== undefined ? { query: { limit } } : undefined);
-};
-//# sourceMappingURL=nodes-audit-list.js.map

package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-audit-list.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"nodes-audit-list.js","sourceRoot":"","sources":["../../src/commands/nodes-audit-list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,CAAC,MAAM,qBAAqB,GAAmB,KAAK,EAAE,OAAO,EAAE,EAAE;IACrE,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,OAAO,OAAO,CAAC,WAAW,CACxB,KAAK,EACL,UAAU,kBAAkB,CAAC,MAAM,CAAC,QAAQ,EAC5C,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CACvD,CAAC;AACJ,CAAC,CAAC"}