fix: resolve Antigravity skill path mapping and UI scope bleeding (#64)

Author: SherlockSalvatore

crates/hk-core/src/adapter/antigravity.rs

@@ -61,7 +61,28 @@ impl AgentAdapter for AntigravityAdapter {
         // ~/.agents/skills/ — cross-loading from Gemini CLI requires a manual
         // symlink per Google's own guidance.
         // Source: https://codelabs.developers.google.com/getting-started-with-antigravity-skills
-        vec![self.base_dir().join("skills")]
+        let mut dirs = vec![self.base_dir().join("skills")];
+
+        // Antigravity supports custom skill paths via skills.txt in its base directory.
+        let skills_txt = self.base_dir().join("skills.txt");
+        if let Ok(content) = std::fs::read_to_string(&skills_txt) {
+            for line in content.lines() {
+                let line = line.trim();
+                if line.is_empty() {
+                    continue;
+                }
+                let path = if let Some(stripped) = line.strip_prefix("~/") {
+                    self.home.join(stripped)
+                } else {
+                    PathBuf::from(line)
+                };
+                if !dirs.contains(&path) {
+                    dirs.push(path);
+                }
+            }
+        }
+
+        dirs
     }
     fn project_skill_dirs(&self) -> Vec<String> {
         // Antigravity 1.18.4+ migrated from `.agent/` (singular) to `.agents/`

src/pages/marketplace.tsx

@@ -258,12 +258,17 @@ export default function MarketplacePage() {
     agentName: string,
     activeScope: ScopeValue,
   ) => {
-    const key = `${item.id}:${agentName}`;
-    if (installed.has(key)) return true;
-
     const targetKey =
       activeScope.type === "all" ? null : scopeKey(activeScope as ConfigScope);
 
+    if (targetKey !== null) {
+      if (installed.has(`${item.id}:${agentName}:${targetKey}`)) return true;
+    } else {
+      for (const k of installed) {
+        if (k.startsWith(`${item.id}:${agentName}:`)) return true;
+      }
+    }
+
     return extensions.some((ext) => {
       if (!ext.agents.includes(agentName)) return false;
 
@@ -279,15 +284,17 @@ export default function MarketplacePage() {
         ext.source.url;
       let extSource = "";
       if (extUrl) {
-        const match = extUrl.match(/github\.com\/([^/]+\/[^/]+)/);
-        extSource = match ? match[1].replace(/\.git$/, "") : extUrl;
+        const cleanUrl = extUrl.split(/[?#]/)[0];
+        const match = cleanUrl.match(/github\.com[:/]([^/]+\/[^/]+)/);
+        extSource = match ? match[1].replace(/\.git$/, "") : cleanUrl;
       }
       if (!extSource && ext.pack) extSource = ext.pack;
 
       // GitHub repo slugs are case-insensitive; marketplace normalizes to
       // lowercase while scanner preserves original casing. Compare lowered
       // on both sides to avoid false negatives.
       const itemSourceLower = item.source.toLowerCase();
+      if (!itemSourceLower) return false;
       const matchSource =
         extSource.toLowerCase() === itemSourceLower ||
         (ext.pack ?? "").toLowerCase() === itemSourceLower;
@@ -347,7 +354,8 @@ export default function MarketplacePage() {
       // Refresh extension store so audit page can resolve names immediately
       useExtensionStore.getState().fetch();
       const key = `${item.id}:${targetAgent ?? ""}`;
-      setInstalled((prev) => new Set(prev).add(key));
+      const installedKey = `${key}:${scopeKey(targetScope)}`;
+      setInstalled((prev) => new Set(prev).add(installedKey));
       toast.success(
         result.was_update
           ? t("toast.updated", { name: item.name })