gaia-cli 7.0.0__tar.gz → 7.0.4__tar.gz

{gaia_cli-7.0.0/src/gaia_cli.egg-info → gaia_cli-7.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gaia-cli
-Version: 7.0.0
+Version: 7.0.4
 Summary: Gaia AI Agent Skill Registry CLI
 Author: Gaia contributors
 License: MIT
@@ -87,7 +87,7 @@ Generate yours at **[gaiaskilltree.com/badges/](https://gaiaskilltree.com/badges
 
 ---
 
-## Change Management — Yggdrasil II (July 2026)
+## Yggdrasil II just dropped! (July 2026)
 
 Gaia has moved from **Yggdrasil I** to **Yggdrasil II**, the ratified meta that governs how skills are typed, ranked, and trusted. If you last looked before July 2026, three things changed:
 
@@ -154,7 +154,7 @@ Uniques — Basic Skills that reached elite mastery (4★+) through depth alone,
     └─ ○ /logical-inference
   ◉ addy-osmani/performance-optimization  [4★]
 
-(243 skills total — see docs/tree.md)
+(246 skills total — see docs/tree.md)
 ```
 <!-- gaia:registry-end -->
 
@@ -245,7 +245,7 @@ curl https://gaiaskilltree.com/api/v1/leaderboard.json
 **1. CLI
 
 <!-- gaia:version-start -->
-Current Gaia CLI version: `7.0.0`.
+Current Gaia CLI version: `7.0.4`.
 
 ```bash
 curl -fsSL https://gaiaskilltree.com/install.sh | sh

{gaia_cli-7.0.0 → gaia_cli-7.0.4}/README.md

@@ -33,7 +33,7 @@ Generate yours at **[gaiaskilltree.com/badges/](https://gaiaskilltree.com/badges
 
 ---
 
-## Change Management — Yggdrasil II (July 2026)
+## Yggdrasil II just dropped! (July 2026)
 
 Gaia has moved from **Yggdrasil I** to **Yggdrasil II**, the ratified meta that governs how skills are typed, ranked, and trusted. If you last looked before July 2026, three things changed:
 
@@ -100,7 +100,7 @@ Uniques — Basic Skills that reached elite mastery (4★+) through depth alone,
     └─ ○ /logical-inference
   ◉ addy-osmani/performance-optimization  [4★]
 
-(243 skills total — see docs/tree.md)
+(246 skills total — see docs/tree.md)
 ```
 <!-- gaia:registry-end -->
 
@@ -191,7 +191,7 @@ curl https://gaiaskilltree.com/api/v1/leaderboard.json
 **1. CLI
 
 <!-- gaia:version-start -->
-Current Gaia CLI version: `7.0.0`.
+Current Gaia CLI version: `7.0.4`.
 
 ```bash
 curl -fsSL https://gaiaskilltree.com/install.sh | sh

{gaia_cli-7.0.0 → gaia_cli-7.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gaia-cli"
-version = "7.0.0"
+version = "7.0.4"
 description = "Gaia AI Agent Skill Registry CLI"
 readme = "README.md"
 requires-python = ">=3.10"

{gaia_cli-7.0.0 → gaia_cli-7.0.4}/src/gaia_cli/treeManager.py

@@ -577,11 +577,11 @@ def show_tree(tree_data, graph_data=None, registry_path=".", mode="default", can
                     if isinstance(data, dict):
                         sources = data.get("sources", [])
                         level = data.get("level", "1★")
-                        stype = data.get("type", "extra")
+                        stype = data.get("type", "fusion")
                     else:
                         sources = data
                         level = "1★"
-                        stype = "extra"
+                        stype = "fusion"
                     
                     skill_map[target] = {
                         "id": target,

{gaia_cli-7.0.0 → gaia_cli-7.0.4}/src/gaia_cli/tui/screens/agent.py

@@ -16,6 +16,7 @@ from textual import events, on, work
 from rich.text import Text
 
 from gaia_cli.tui import tokens as T
+from gaia_cli.taxonomy import branchFor, rankWord
 
 
 # ── Data helpers ──────────────────────────────────────────────────────────────
@@ -32,14 +33,16 @@ def _load_skills(registry_path: str) -> list[dict]:
         username = cfg.get("gaiaUser", cfg.get("user", ""))
         ctx = LocalContext.load(registry_path, username)
         for sid, skill in ctx._skill_map.items():
-            tier = skill.get("type", "basic")
+            # Ygg II: the display axis keys on the derived BRANCH
+            # (standard|suite|unique), not the {basic,fusion} type axis.
+            branch = branchFor(skill)
             level = skill.get("level", "")
             desc = skill.get("description", "")
             is_detected = sid in ctx.detected_ids
             is_owned = sid in ctx.owned_ids
             skills[sid] = {
                 "id": sid,
-                "type": tier,
+                "branch": branch,
                 "level": level,
                 "description": desc,
                 "installed": is_detected or is_owned,
@@ -58,7 +61,11 @@ def _load_skills(registry_path: str) -> list[dict]:
             if sid not in skills:
                 skills[sid] = {
                     "id": sid,
-                    "type": meta.get("type", "extra"),
+                    # Ygg II: derive the display branch via the taxonomy
+                    # authority (meta carries level/suiteComponents). The branch
+                    # consumers (_skill_label, branchorder) key on branch words
+                    # (standard|suite|unique), NOT the {basic,fusion} type axis.
+                    "branch": branchFor(meta),
                     "level": meta.get("level", ""),
                     "description": meta.get("description", ""),
                     "installed": sid in installed_ids,
@@ -70,14 +77,14 @@ def _load_skills(registry_path: str) -> list[dict]:
     except Exception:
         pass
 
-    # Sort: detected/local first, then installed, then by type weight, then alphabetical
-    _type_order = {"ultimate": 0, "unique": 1, "extra": 2, "basic": 3}
+    # Sort: detected/local first, then installed, then by branch weight, then alphabetical
+    branchorder = {"unique": 0, "suite": 1, "standard": 2}
     return sorted(
         skills.values(),
         key=lambda s: (
             not s.get("detected", False),
             not s.get("installed", False),
-            _type_order.get(s.get("type", "basic"), 4),
+            branchorder.get(s.get("branch", "standard"), 4),
             s["id"],
         ),
     )
@@ -99,8 +106,8 @@ def _filter_skills(query: str, skills: list[dict]) -> list[dict]:
 # ── Skill row rendering ───────────────────────────────────────────────────────
 
 def _skill_label(skill: dict) -> Text:
-    tier = skill.get("type", "basic")
-    glyph = T.GLYPH_BY_TIER.get(tier, "○")
+    branch = skill.get("branch", "standard")
+    glyph = T.BRANCH_GLYPH.get(branch, "○")
     sid = skill["id"]
     level = skill.get("level", "")
     owned = skill.get("owned", False)
@@ -108,7 +115,7 @@ def _skill_label(skill: dict) -> Text:
     installed = skill.get("installed", False)
 
     t = Text()
-    t.append(glyph + " ", style=T.TIER_BY_KEY.get(tier, T.NEUTRAL_TEXT_MUTED))
+    t.append(glyph + " ", style=T.BRANCH_ACCENT.get(branch, T.NEUTRAL_TEXT_MUTED))
 
     # Name rendering: @handle/slug
     name_style = T.STATE_OWNED if (owned or detected) else T.NEUTRAL_TEXT
@@ -148,21 +155,26 @@ class InstallModal(ModalScreen):
         self._installing = False
 
     def compose(self) -> ComposeResult:
-        tier = self.skill.get("type", "basic")
-        tier_color = T.TIER_BY_KEY.get(tier, T.NEUTRAL_TEXT_MUTED)
-        glyph = T.GLYPH_BY_TIER.get(tier, "○")
+        branch = self.skill.get("branch", "standard")
+        branch_color = T.BRANCH_ACCENT.get(branch, T.NEUTRAL_TEXT_MUTED)
+        glyph = T.BRANCH_GLYPH.get(branch, "○")
 
         with Static(id="install-dialog"):
             yield Static("Install skill", id="install-title")
             yield Static(
                 Text.from_markup(
-                    f"[bold {tier_color}]{glyph} {self.skill['id']}[/]"
+                    f"[bold {branch_color}]{glyph} {self.skill['id']}[/]"
                 ),
                 id="install-skill-id",
             )
+            # Meta line: the authority's rank word (e.g. "Named", "Extra",
+            # "Unique Impossible") — never the raw branch key. rankWord reads
+            # (level, branch) and always returns a word (floor "Basic" at 0★);
+            # the `if rank` guard below is defensive, not for an empty return.
             meta_parts = []
-            if self.skill.get("type"):
-                meta_parts.append(self.skill["type"])
+            rank = rankWord(self.skill.get("level", ""), branch)
+            if rank:
+                meta_parts.append(rank)
             if self.skill.get("level"):
                 meta_parts.append(self.skill["level"])
             yield Static("  ·  ".join(meta_parts), id="install-meta")
@@ -374,7 +386,9 @@ class AgentScreen(Screen):
                     self.app.push_screen(
                         LevelUpModal(
                             skill["id"],
-                            skill.get("type", "basic"),
+                            # skill["branch"] is the derived branch (standard|
+                            # suite|unique) — see _load_skills.
+                            skill.get("branch", "standard"),
                             skill.get("level", ""),
                         )
                     )

{gaia_cli-7.0.0 → gaia_cli-7.0.4}/src/gaia_cli/tui/screens/hero.py

@@ -72,16 +72,21 @@ def _title_text(frame: int) -> Text:
 
 def _load_stats(registry_path: str) -> dict:
     import json
+    from gaia_cli.taxonomy import branchFor
     path = os.path.join(registry_path, "registry", "gaia.json")
     if not os.path.exists(path):
-        return {"total": 0, "extra": 0, "ultimate": 0, "named": 0}
+        return {"total": 0, "standard": 0, "suite": 0, "unique": 0, "named": 0}
     with open(path, encoding="utf-8") as f:
         data = json.load(f)
     skills = data.get("skills", [])
-    type_counts: dict[str, int] = {}
+    # Ygg II: distribution keys on the derived BRANCH (standard|suite|unique)
+    # via the taxonomy authority, not the retired {basic,extra,unique,ultimate}
+    # type axis. Generic gaia.json nodes carry namedMaxLevel, which branchFor
+    # reads as the effective rank.
+    branch_counts: dict[str, int] = {}
     for s in skills:
-        t = s.get("type", "basic")
-        type_counts[t] = type_counts.get(t, 0) + 1
+        b = branchFor(s)
+        branch_counts[b] = branch_counts.get(b, 0) + 1
 
     # Count named skills
     named_dir = os.path.join(registry_path, "registry", "named")
@@ -92,10 +97,9 @@ def _load_stats(registry_path: str) -> dict:
 
     return {
         "total":    len(skills),
-        "basic":    type_counts.get("basic", 0),
-        "extra":    type_counts.get("extra", 0),
-        "unique":   type_counts.get("unique", 0),
-        "ultimate": type_counts.get("ultimate", 0),
+        "standard": branch_counts.get("standard", 0),
+        "suite":    branch_counts.get("suite", 0),
+        "unique":   branch_counts.get("unique", 0),
         "named":    named,
     }
 
@@ -138,14 +142,14 @@ class HeroScreen(Screen):
         self.set_timer(3.0, self._advance)
 
     def _tick(self) -> None:
-        self._frame = (self._frame + 1) % (len(T.CYCLE_ULTIMATE) * 8)
+        self._frame = (self._frame + 1) % (len(T.CYCLE_APEX) * 8)
         self._render_frame()
 
     def _render_frame(self) -> None:
         frame = self._frame
 
-        # Seal color cycles through CYCLE_ULTIMATE, 8 frames per stop
-        cycle = T.CYCLE_ULTIMATE
+        # Seal color cycles through CYCLE_APEX, 8 frames per stop
+        cycle = T.CYCLE_APEX
         stop_idx = (frame // 8) % len(cycle)
         next_idx = (stop_idx + 1) % len(cycle)
         t_blend  = (frame % 8) / 8.0
@@ -171,11 +175,11 @@ class HeroScreen(Screen):
             self.query_one("#hero-stats", Static).update("")
             return
         t = Text()
-        t.append(f"○ {s['basic']} basic", style=T.TIER_BASIC)
+        t.append(f"○ {s['standard']} standard", style=T.BRANCH_ACCENT["standard"])
         t.append("  ·  ", style=T.NEUTRAL_TEXT_MUTED)
-        t.append(f"◇ {s['extra']} extra", style=T.TIER_EXTRA)
+        t.append(f"◉ {s['unique']} unique", style=T.BRANCH_ACCENT["unique"])
         t.append("  ·  ", style=T.NEUTRAL_TEXT_MUTED)
-        t.append(f"◆ {s['ultimate']} ultimate", style=T.TIER_ULTIMATE)
+        t.append(f"◆ {s['suite']} suite", style=T.BRANCH_ACCENT["suite"])
         t.append("  ·  ", style=T.NEUTRAL_TEXT_MUTED)
         t.append(f"✦ {s['named']} named", style=T.BRAND_APEX_GOLD)
         self.query_one("#hero-stats", Static).update(Align.center(t))

{gaia_cli-7.0.0 → gaia_cli-7.0.4}/src/gaia_cli/tui/screens/levelup.py

@@ -1,7 +1,15 @@
 """Level-up modal — anime-style unlock animation.
 
-Triggered after a successful skill install. Cycles through glyph
-frames and shows tier-colored text before auto-dismissing.
+Triggered after a successful skill install. Cycles through glyph frames and
+shows rank-colored text before auto-dismissing.
+
+BUILD + READ ONLY (Ygg III forward-compat): this modal derives nothing about
+branch/rank itself. It reads the caller-supplied branch word (already resolved
+via ``taxonomy.branchFor``) and the star level, and calls the taxonomy authority
+(``levelNum`` / ``rankWord``) for every display decision. There
+are no hand-keyed branch→frame or branch→banner tables — the animation depth is
+a *stars* concept (``levelNum``) and the banner text is the authority's
+``rankWord``; branch only selects the accent color.
 """
 
 from __future__ import annotations
@@ -15,30 +23,22 @@ from rich.text import Text
 from rich.align import Align
 
 from gaia_cli.tui import tokens as T
+from gaia_cli.taxonomy import levelNum, rankWord
 
-_TIER_LABEL = {"basic": "BASIC", "extra": "EXTRA", "unique": "UNIQUE", "ultimate": "ULTIMATE"}
-
-# Animation frames: glyph + color pair. Color sequence walks the rank ramp:
-# dormant (border) → unawakened slate → awakened sky-blue → evolved violet
-# → unique deep-violet → apex gold. Indexes map to tiers via _TIER_FRAME_IDX.
+# Animation frames: glyph + color pair, indexed by star level 0..6. Frame N is
+# shown for an N-star unlock, so the reveal climbs the shared rank ramp and, at
+# 4★+, lands on the branch pinnacle. This is a pure stars ladder — NOT a
+# branch→frame map — so no banned resolver logic lives here.
 _FRAMES = [
-    ("·", T.NEUTRAL_BORDER),
-    ("○", T.RANK_UNAWAKENED),
-    ("○", T.RANK_AWAKENED),
-    ("◇", T.TIER_EXTRA),
-    ("◉", T.TIER_UNIQUE),
-    ("◆", T.BRAND_APEX_GOLD),
+    ("·", T.NEUTRAL_BORDER),          # 0★ dormant
+    ("○", T.RANK_AWAKENED),           # 1★ awakened — sky blue
+    ("○", T.RANK_NAMED),              # 2★ named — teal
+    ("◇", T.RANK_EVOLVED),            # 3★ evolved — violet
+    ("◈", T.RANK_EXTRA),              # 4★ extra/unique — fuchsia
+    ("◆", T.RANK_ULTIMATE),           # 5★ ultimate — amber
+    ("✦", T.BRAND_APEX_GOLD),         # 6★ apex — gold
 ]
 
-_TIER_FRAME_IDX = {"basic": 2, "extra": 3, "unique": 4, "ultimate": 5}
-
-_BANNERS = {
-    "basic":    " SKILL ACQUIRED ",
-    "extra":    " SKILL UNLOCKED ",
-    "unique":   " ★  RARE SKILL  ★ ",
-    "ultimate": " ★ ★  ULTIMATE  ★ ★ ",
-}
-
 
 class LevelUpModal(ModalScreen[None]):
     """Flashy level-up screen. Dismiss with any key or auto-dismiss after 2.5s."""
@@ -51,12 +51,16 @@ class LevelUpModal(ModalScreen[None]):
 
     _frame: reactive[int] = reactive(0, init=False)
 
-    def __init__(self, skill_id: str, tier: str, level: str = ""):
+    def __init__(self, skill_id: str, branch: str, level: str = ""):
         super().__init__()
         self.skill_id = skill_id
-        self.tier = tier
+        # branch is a resolved display-branch word (standard|suite|unique) the
+        # caller obtained from taxonomy.branchFor — never re-derived here.
+        self.branch = branch
         self.level = level
-        self._target_frame = _TIER_FRAME_IDX.get(tier, 3)
+        # Frame depth is the star level, clamped through the authority. A 6★
+        # unlock climbs to the apex frame; a 2★ unlock stops at the named frame.
+        self._target_frame = levelNum(level)
 
     def compose(self) -> ComposeResult:
         yield Static(id="lu-backdrop")
@@ -77,8 +81,13 @@ class LevelUpModal(ModalScreen[None]):
     def _render_frame(self, frame_idx: int) -> None:
         card = self.query_one("#lu-card", Static)
         glyph, gcolor = _FRAMES[min(frame_idx, len(_FRAMES) - 1)]
-        tier_color = T.TIER_BY_KEY.get(self.tier, T.NEUTRAL_TEXT_MUTED)
-        banner = _BANNERS.get(self.tier, " SKILL UNLOCKED ")
+        # Accent color: read the branch→accent token map (build+read — no inline
+        # branch logic). Banner text: the authority's rank word for this
+        # (level, branch), so a 4★ suite reads "EXTRA", a 6★ unique reads
+        # "UNIQUE IMPOSSIBLE", a 2★ reads "NAMED" — never a hand-rolled label.
+        accent = T.BRANCH_ACCENT.get(self.branch, T.NEUTRAL_TEXT_MUTED)
+        word = rankWord(self.level, self.branch)
+        banner = f" {word.upper()} " if word else " SKILL UNLOCKED "
         sid = self.skill_id
 
         lines: list[tuple[str | Text, str]] = []
@@ -88,12 +97,12 @@ class LevelUpModal(ModalScreen[None]):
         # width calculation needs the raw sid length
         width = max(len(sid) + 10, len(banner) + 4, 36)
         border_h = "═" * (width - 2)
-        lines.append((f"╔{border_h}╗", tier_color))
+        lines.append((f"╔{border_h}╗", accent))
         lines.append((f"║{'':^{width-2}}║", gutter))
 
         # Banner
         padded_banner = banner.center(width - 2)
-        lines.append((f"║{padded_banner}║", tier_color))
+        lines.append((f"║{padded_banner}║", accent))
 
         # Glyph animation (big)
         big_glyph = f"  {glyph}  "
@@ -138,7 +147,7 @@ class LevelUpModal(ModalScreen[None]):
             progress += g + " "
         progress_line = progress.strip().center(width - 2)
         lines.append((f"║{'':^{width-2}}║", gutter))
-        lines.append((f"║{progress_line}║", tier_color))
+        lines.append((f"║{progress_line}║", accent))
 
         # Hint
         hint = " [press any key] "
@@ -148,7 +157,7 @@ class LevelUpModal(ModalScreen[None]):
         lines.append((f"║{hint:^{width-2}}║", T.NEUTRAL_TEXT_DIM))
 
         # Bottom border
-        lines.append((f"╚{border_h}╝", tier_color))
+        lines.append((f"╚{border_h}╝", accent))
 
         t = Text()
         for line, color in lines:

{gaia_cli-7.0.0 → gaia_cli-7.0.4}/src/gaia_cli/tui/screens/tree.py

@@ -1,6 +1,6 @@
 """Skill tree screen — navigable RPG-style dependency graph.
 
-Left panel: collapsible Textual Tree, tier-colored.
+Left panel: collapsible Textual Tree, branch-colored.
 Right panel: reactive skill detail card.
 """
 
@@ -21,6 +21,16 @@ from textual import events, on
 from rich.text import Text
 
 from gaia_cli.tui import tokens as T
+from gaia_cli.taxonomy import branchFor
+
+
+def _branch(skill: dict) -> str:
+    """Ygg II display branch (standard|suite|unique) via the taxonomy authority.
+
+    Replaces the retired {basic,extra,unique,ultimate} `type`-as-branch read. The
+    token tables (BRANCH_GLYPH / BRANCH_ACCENT) key on these branch words.
+    """
+    return branchFor(skill)
 
 
 def _load_graph(registry_path: str) -> dict:
@@ -55,8 +65,8 @@ def _build_tree_data(
     all_ids = set(skills.keys())
     has_parent = set(parents.keys())
     roots = sorted(all_ids - has_parent, key=lambda x: (
-        {"ultimate": 0, "unique": 1, "extra": 2, "basic": 3}.get(
-            skills.get(x, {}).get("type", "basic"), 4
+        {"unique": 0, "suite": 1, "standard": 2}.get(
+            _branch(skills.get(x, {})), 3
         ),
         x,
     ))
@@ -72,9 +82,9 @@ def _build_tree_data(
 
 
 def _node_label(skill: dict, owned_ids: set, detected_ids: set) -> Text:
-    tid = skill.get("type", "basic")
-    glyph = T.GLYPH_BY_TIER.get(tid, "○")
-    color = T.TIER_BY_KEY.get(tid, T.NEUTRAL_TEXT_MUTED)
+    branch = _branch(skill)
+    glyph = T.BRANCH_GLYPH.get(branch, "○")
+    color = T.BRANCH_ACCENT.get(branch, T.NEUTRAL_TEXT_MUTED)
     sid = skill.get("id", "?")
     level = skill.get("level", "")
     owned = sid in owned_ids
@@ -123,9 +133,9 @@ class SkillDetail(Static):
         if not skill:
             return Text(sid, style=T.NEUTRAL_TEXT_MUTED)
 
-        tid = skill.get("type", "basic")
-        glyph = T.GLYPH_BY_TIER.get(tid, "○")
-        color = T.TIER_BY_KEY.get(tid, T.NEUTRAL_TEXT_MUTED)
+        branch = _branch(skill)
+        glyph = T.BRANCH_GLYPH.get(branch, "○")
+        color = T.BRANCH_ACCENT.get(branch, T.NEUTRAL_TEXT_MUTED)
         level = skill.get("level", "")
         level_color = T.RANK_BY_STAR.get(level, T.NEUTRAL_TEXT_DIM)
         desc = skill.get("description", "")
@@ -143,8 +153,8 @@ class SkillDetail(Static):
         t.append(f"{name}\n", style=T.NEUTRAL_TEXT_MUTED)
         t.append("\n")
 
-        # Tier + level
-        t.append(f"{tid.upper()}  ", style=color)
+        # Branch + level
+        t.append(f"{branch.upper()}  ", style=color)
         if level:
             t.append(f"{level}\n", style=level_color)
         else:
@@ -170,9 +180,9 @@ class SkillDetail(Static):
             t.append("Requires:\n", style=T.NEUTRAL_TEXT_MUTED)
             for p in parents[:6]:
                 p_skill = skills.get(p, {})
-                p_tid = p_skill.get("type", "basic")
-                p_color = T.TIER_BY_KEY.get(p_tid, T.NEUTRAL_TEXT_MUTED)
-                t.append(f"  {T.GLYPH_BY_TIER.get(p_tid, '○')} {p}\n", style=p_color)
+                p_branch = _branch(p_skill)
+                p_color = T.BRANCH_ACCENT.get(p_branch, T.NEUTRAL_TEXT_MUTED)
+                t.append(f"  {T.BRANCH_GLYPH.get(p_branch, '○')} {p}\n", style=p_color)
             if len(parents) > 6:
                 t.append(f"  … +{len(parents) - 6} more\n", style=T.NEUTRAL_TEXT_DIM)
             t.append("\n")
@@ -182,9 +192,9 @@ class SkillDetail(Static):
             t.append("Unlocks:\n", style=T.NEUTRAL_TEXT_MUTED)
             for c in children[:6]:
                 c_skill = skills.get(c, {})
-                c_tid = c_skill.get("type", "basic")
-                c_color = T.TIER_BY_KEY.get(c_tid, T.NEUTRAL_TEXT_MUTED)
-                t.append(f"  {T.GLYPH_BY_TIER.get(c_tid, '○')} {c}\n", style=c_color)
+                c_branch = _branch(c_skill)
+                c_color = T.BRANCH_ACCENT.get(c_branch, T.NEUTRAL_TEXT_MUTED)
+                t.append(f"  {T.BRANCH_GLYPH.get(c_branch, '○')} {c}\n", style=c_color)
             if len(children) > 6:
                 t.append(f"  … +{len(children) - 6} more\n", style=T.NEUTRAL_TEXT_DIM)
 
@@ -290,21 +300,21 @@ class SkillTreeScreen(Screen):
         else:
             visible_nodes = set(skills.keys())
 
-        # Group roots by tier for visual structure
-        tier_order = {"ultimate": 0, "unique": 1, "extra": 2, "basic": 3}
-        tier_roots: dict[str, list[str]] = {t: [] for t in tier_order}
+        # Group roots by branch membership (Ygg II taxonomy authority) for
+        # visual structure. Unique first, then Suite, then Standard.
+        branch_order = {"unique": 0, "suite": 1, "standard": 2}
+        branch_roots: dict[str, list[str]] = {b: [] for b in branch_order}
         for sid in roots:
             if sid not in visible_nodes:
                 continue
             skill = skills.get(sid, {})
-            tier = skill.get("type", "basic")
-            tier_roots.setdefault(tier, []).append(sid)
-
-        tier_labels = {
-            "ultimate": ("◆ ULTIMATES", T.TIER_ULTIMATE),
-            "unique":   ("◉ UNIQUES",   T.TIER_UNIQUE),
-            "extra":    ("◇ EXTRAS",    T.TIER_EXTRA),
-            "basic":    ("○ BASICS",    T.TIER_BASIC),
+            branch = _branch(skill)
+            branch_roots.setdefault(branch, []).append(sid)
+
+        branch_labels = {
+            "unique":   ("◉ UNIQUE",   T.BRANCH_ACCENT["unique"]),
+            "suite":    ("◆ SUITE",    T.BRANCH_ACCENT["suite"]),
+            "standard": ("○ STANDARD", T.BRANCH_ACCENT["standard"]),
         }
 
         visited: set[str] = set()
@@ -314,12 +324,12 @@ class SkillTreeScreen(Screen):
             should_expand_all = bool(query)
 
             for child_id in sorted(children.get(sid, []), key=lambda x: (
-                tier_order.get(skills.get(x, {}).get("type", "basic"), 4), x
+                branch_order.get(_branch(skills.get(x, {})), 3), x
             )):
                 if child_id not in visible_nodes or child_id in visited:
                     continue
                 visited.add(child_id)
-                child_skill = skills.get(child_id, {"id": child_id, "type": "basic"})
+                child_skill = skills.get(child_id, {"id": child_id})
                 label = _node_label(child_skill, owned, detected)
                 has_kids = any(k in visible_nodes for k in children.get(child_id, []))
                 
@@ -333,25 +343,25 @@ class SkillTreeScreen(Screen):
                     if should_expand_all or depth < 1:
                         add_children(child_node, child_id, depth + 1)
 
-        for tier in ["ultimate", "unique", "extra", "basic"]:
-            sids = tier_roots.get(tier, [])
+        for branch in ["unique", "suite", "standard"]:
+            sids = branch_roots.get(branch, [])
             if not sids:
                 continue
-            label_text, color = tier_labels[tier]
-            tier_node = tree.root.add(
+            label_text, color = branch_labels[branch]
+            branch_node = tree.root.add(
                 Text(label_text, style=f"bold {color}"),
-                data=f"__tier_{tier}",
+                data=f"__branch_{branch}",
                 expand=True,
             )
             for sid in sorted(sids):
                 if sid in visited:
                     continue
                 visited.add(sid)
-                skill = skills.get(sid, {"id": sid, "type": tier})
+                skill = skills.get(sid, {"id": sid})
                 label = _node_label(skill, owned, detected)
                 has_kids = any(k in visible_nodes for k in children.get(sid, []))
-                
-                skill_node = tier_node.add(
+
+                skill_node = branch_node.add(
                     label,
                     data=sid,
                     expand=bool(query) and has_kids,
@@ -359,7 +369,7 @@ class SkillTreeScreen(Screen):
                 )
                 self._node_map[id(skill_node)] = sid
                 if has_kids:
-                    if query or tier in ("ultimate", "unique"):
+                    if query or branch in ("unique", "suite"):
                         add_children(skill_node, sid, depth=1)
 
     @on(Input.Changed, "#tree-search")
@@ -378,7 +388,7 @@ class SkillTreeScreen(Screen):
 
     def on_tree_node_highlighted(self, event: Tree.NodeHighlighted) -> None:
         sid = event.node.data
-        if sid and not str(sid).startswith("__tier_"):
+        if sid and not str(sid).startswith("__branch_"):
             detail = self.query_one("#detail-panel", SkillDetail)
             detail.skill_id = str(sid)
 
@@ -403,10 +413,10 @@ class SkillTreeScreen(Screen):
     def action_install_focused(self) -> None:
         tree = self.query_one("#skill-tree", Tree)
         node = tree.cursor_node
-        if node and node.data and not str(node.data).startswith("__tier_"):
+        if node and node.data and not str(node.data).startswith("__branch_"):
             sid = str(node.data)
             skills = self._tree_data.get("skills", {})
-            skill = skills.get(sid, {"id": sid, "type": "basic", "level": ""})
+            skill = skills.get(sid, {"id": sid, "level": ""})
             from gaia_cli.tui.screens.agent import InstallModal
 
             def _on_install(installed: bool) -> None:
@@ -421,7 +431,7 @@ class SkillTreeScreen(Screen):
 
     def _rebuild_node_label(self, node: TreeNode, sid: str) -> None:
         skills = self._tree_data.get("skills", {})
-        skill = skills.get(sid, {"id": sid, "type": "basic"})
+        skill = skills.get(sid, {"id": sid})
         node.set_label(_node_label(skill, self._owned, self._detected))
 
     def action_goto_agent(self) -> None: