gaia-cli 4.3.5__tar.gz → 4.3.7__tar.gz

{gaia_cli-4.3.5/src/gaia_cli.egg-info → gaia_cli-4.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gaia-cli
-Version: 4.3.5
+Version: 4.3.7
 Summary: Gaia AI Agent Skill Registry CLI
 Author: Gaia contributors
 License: MIT
@@ -167,7 +167,7 @@ Skills rank up through **verifiable evidence** (Class A/B/C) and can be demoted
 **1. Install the CLI**
 
 <!-- gaia:version-start -->
-Current Gaia CLI version: `4.3.5`.
+Current Gaia CLI version: `4.3.7`.
 
 ```bash
 curl -fsSL https://gaia.tiongson.co/install.sh | sh

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/README.md

@@ -118,7 +118,7 @@ Skills rank up through **verifiable evidence** (Class A/B/C) and can be demoted
 **1. Install the CLI**
 
 <!-- gaia:version-start -->
-Current Gaia CLI version: `4.3.5`.
+Current Gaia CLI version: `4.3.7`.
 
 ```bash
 curl -fsSL https://gaia.tiongson.co/install.sh | sh

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/pyproject.toml

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

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/src/gaia_cli/cardRenderer.py

@@ -561,6 +561,20 @@ def render_appraise_card(
         deriv_line = prefix + ", ".join(deriv_items)
         if len(derivatives) > 4:
             deriv_line += f" +{len(derivatives) - 4} more"
+        # Truncate at comma boundary instead of mid-word
+        if len(deriv_line) > inner:
+            truncated = prefix
+            for i, item in enumerate(deriv_items):
+                candidate = truncated + (", " if i > 0 else "") + item
+                if len(candidate) > inner - 2:  # leave room for " …"
+                    remaining = len(deriv_items) - i + (len(derivatives) - 4 if len(derivatives) > 4 else 0)
+                    truncated += f" +{remaining} more" if remaining > 0 else ""
+                    break
+                truncated = candidate
+            else:
+                if len(derivatives) > 4:
+                    truncated += f" +{len(derivatives) - 4} more"
+            deriv_line = truncated
         lines.append(f"{bc}{V}{r} {fg(*COLOR_MUTED)}{_pad(deriv_line, inner)}{r} {bc}{V}{r}")
     else:
         lines.append(f"{bc}{V}{r} {fg(*COLOR_MUTED)}{_pad('Unlocks: (terminal skill)', inner)}{r} {bc}{V}{r}")

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/src/gaia_cli/commands/stats.py

@@ -133,7 +133,9 @@ def collect_stats(registry_path: str | Path) -> dict:
         ]
 
     type_counts = Counter(skill.get("type", "unknown") for skill in skills)
-    level_counts = Counter(skill.get("level", "?") for skill in skills)
+    level_counts = Counter(
+        skill["level"] for skill in skills if "level" in skill
+    )
     effective_level_counts = Counter()
     demerit_counts: Counter[str] = Counter()
     skills_with_demerits = 0

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/src/gaia_cli/graph.py

@@ -1205,7 +1205,7 @@ def graph_command(args: Any) -> None:
         pass  # Degrade gracefully to canon mode
 
     out_path = write_graph_artifact(registry_path, output=output, fmt=fmt, user_ctx=user_ctx)
-    print(f"  saved {os.path.basename(out_path)}")
+    print(f"  saved {out_path}")
 
     # Regenerate the GEXF from current node data
     if fmt == "html":

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/src/gaia_cli/main.py

@@ -294,8 +294,8 @@ def init_command(args):
     config_dir = '.gaia'
     os.makedirs(config_dir, exist_ok=True)
     config_path = os.path.join(config_dir, 'config.toml')
-    if os.path.exists(config_path):
-        print("Gaia is already initialized in this repository.")
+    if os.path.exists(config_path) and not getattr(args, "force", False):
+        print("Gaia is already initialized in this repository. Use --force to overwrite.")
         return
 
     username = args.user or _detect_github_username()
@@ -472,16 +472,20 @@ def scan_command(args):
         skill_map = {s['id']: s for s in graph_data.get('skills', [])}
         unlocked = [s.get('skillId') for s in tree.get('unlockedSkills', [])]
         combos = get_combinations(graph_data, unlocked, resolved)
-        if combos and not quiet:
-            print("\nNew fusion candidates:")
-            for c in combos:
-                result_skill = skill_map.get(c['candidateResult'], {})
-                result_type = result_skill.get('type', 'extra')
-                print(render_fusion_diagram(
-                    c['detectedSkills'], c['candidateResult'], result_type,
-                    canon=canon, ctx=ctx
-                ))
-            print("Run `gaia fuse <skill>` to confirm.")
+        if combos:
+            # Persist fusion candidates so `gaia fuse` can find them
+            tree['pendingCombinations'] = combos
+            save_tree(username, tree, registry_path=args.registry)
+            if not quiet:
+                print("\nNew fusion candidates:")
+                for c in combos:
+                    result_skill = skill_map.get(c['candidateResult'], {})
+                    result_type = result_skill.get('type', 'extra')
+                    print(render_fusion_diagram(
+                        c['detectedSkills'], c['candidateResult'], result_type,
+                        canon=canon, ctx=ctx
+                    ))
+                print("Run `gaia fuse <skill>` to confirm.")
 
         # Path engine integration
         old_paths = load_paths()
@@ -537,7 +541,7 @@ def render_user_tree_outputs(username: str, tree: dict | None, graph_data: dict
     with open(html_path, "w", encoding="utf-8") as f:
         f.write(html)
     if not quiet:
-        print(f"  saved {os.path.basename(html_path)} & {os.path.basename(md_path)}")
+        print(f"  saved {html_path} & {md_path}")
     return html_path, md_path
 
 
@@ -599,7 +603,8 @@ def lookup_command(args):
         display = skill.get("name") or f"/{skill_id}"
     print(f"{display}")
     
-    print(f"Type: {skill.get('type', 'unknown')}    Level: {skill.get('level', '?')}")
+    user_level = ctx.skill_level(skill_id) if ctx else skill.get('level', '?')
+    print(f"Type: {skill.get('type', 'unknown')}    Level: {user_level}")
     if skill.get("description"):
         print(skill["description"])
 
@@ -792,7 +797,7 @@ def promote_command(args):
             return
         if not skill_id:
             # Try interactive picker
-            candidates = promotable_candidates(username, args.registry)
+            candidates = promotable_candidates(args.registry, username)
             if candidates:
                 picked = select_promotion_candidate(candidates, "Select skill to promote:")
                 if picked:
@@ -1284,9 +1289,9 @@ def install_command(args):
         interactive_install(args.registry, location=location)
         return
     if not args.skill_id:
-        # Bare 'gaia install' -> update/sync all
-        update_skills(args.registry)
-        return
+        print("Usage: gaia install <skill_id>", file=sys.stderr)
+        print("  To update all installed skills, use: gaia update", file=sys.stderr)
+        sys.exit(2)
 
     # Use suite logic if flagged or implicitly requested
     if getattr(args, 'ultimate', False) or getattr(args, 'suite', False):
@@ -1300,7 +1305,7 @@ def install_command(args):
 
 def uninstall_command(args):
     from gaia_cli.install import uninstall_skill
-    success = uninstall_skill(args.skill_id)
+    success = uninstall_skill(args.skill_id.lstrip("/"))
     if not success:
         sys.exit(1)
 
@@ -1362,7 +1367,7 @@ def skills_command(args):
 
 
     available = [
-        {"id": sid, "name": meta.get("name") or sid, "level": meta.get("level", "?"), "description": meta.get("description", "")}
+        {"id": sid, "name": meta.get("name") or sid, "level": meta.get("level", "?"), "type": meta.get("type", "basic"), "description": meta.get("description", "")}
         for sid, meta in list_available(args.registry)
     ]
     items = available + pending
@@ -1459,6 +1464,12 @@ def pull_command(args):
             print("Note: Registry could not be updated via git (no upstream configured). Local registry unchanged.", file=sys.stderr)
         else:
             print(f"Warning: git pull failed. Local registry unchanged.\n  {stderr}", file=sys.stderr)
+    else:
+        stdout = res.stdout.strip()
+        if "Already up to date" in stdout:
+            print("Registry is already up to date.")
+        else:
+            print("Registry updated successfully.")
 
 
 def update_command(args):
@@ -1647,6 +1658,7 @@ def get_parser():
     init_parser.add_argument('--registry-ref', help='Gaia registry URL to write into .gaia/config.toml')
     init_parser.add_argument('--scan', action='append', help='Path to scan; repeat for multiple paths')
     init_parser.add_argument('--yes', action='store_true', help='Use non-interactive defaults')
+    init_parser.add_argument('--force', action='store_true', help='Overwrite existing .gaia/config.toml')
     init_parser.add_argument(
         '--auto-prompt-combinations',
         action='store_true',

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/src/gaia_cli/pathEngine.py

@@ -144,7 +144,12 @@ def render_unlock_path(
             total += c_total
         return owned, total
 
-    owned_count, total_count = _count(tree)
+    # Count prerequisites only (children of root — root is the target, not a prereq).
+    owned_count, total_count = 0, 0
+    for child in tree.get('children', []):
+        c_owned, c_total = _count(child)
+        owned_count += c_owned
+        total_count += c_total
 
     # Render root line manually.
     root_sid = tree['id']

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/src/gaia_cli/prWriter.py

@@ -203,6 +203,11 @@ def open_intake_issue(username, batch_data, batch_path=None, repo_root="."):
 
     issue_url = issue.stdout.strip().splitlines()[-1] if issue.stdout.strip() else ""
     print(f"Success: intake issue opened ({issue_url}).")
+    # Clean up temp body file
+    try:
+        os.remove(body_path)
+    except OSError:
+        pass
     return issue_url or None
 
 

{gaia_cli-4.3.5 → gaia_cli-4.3.7/src/gaia_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gaia-cli
-Version: 4.3.5
+Version: 4.3.7
 Summary: Gaia AI Agent Skill Registry CLI
 Author: Gaia contributors
 License: MIT
@@ -167,7 +167,7 @@ Skills rank up through **verifiable evidence** (Class A/B/C) and can be demoted
 **1. Install the CLI**
 
 <!-- gaia:version-start -->
-Current Gaia CLI version: `4.3.5`.
+Current Gaia CLI version: `4.3.7`.
 
 ```bash
 curl -fsSL https://gaia.tiongson.co/install.sh | sh

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/tests/test_card_renderer.py

@@ -18,6 +18,7 @@ from gaia_cli.cardRenderer import (
     load_and_render,
     _pad,
     _wrap_lines,
+    render_appraise_card,
 )
 
 
@@ -520,3 +521,29 @@ class TestRenderFusionDiagram:
         # First line (shorter name) should be padded
         assert "/ab" in lines[0]
         assert "/longername" in lines[2]
+
+
+def test_render_appraise_card_truncation():
+    skill_data = {
+        "id": "test-skill",
+        "name": "Test Skill",
+        "type": "basic",
+        "level": "0★",
+        "rarity": "common",
+        "description": "Short description.",
+    }
+    derivatives = [
+        {"id": "d1", "name": "First Derivative Skill Name"},
+        {"id": "d2", "name": "Second Derivative Skill Name"},
+        {"id": "d3", "name": "Third Derivative Skill Name"},
+    ]
+    output = render_appraise_card(
+        skill_data=skill_data,
+        prereq_status={},
+        derivatives=derivatives,
+        actions=[],
+    )
+    assert "First Derivative Skill Name" in output
+    assert "+2 more" in output
+    assert "Second Derivative" not in output
+

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/tests/test_dx.py

@@ -445,3 +445,25 @@ def test_gaia_uninstall_command_removes_skill(tmp_path, monkeypatch):
     from gaia_cli.install import load_manifest
     manifest = load_manifest()
     assert not any(e["id"] == "testuser/test-skill" for e in manifest["installed"])
+
+
+def test_init_force_overwrite(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(tmp_path)
+
+    # First init
+    run_cli(monkeypatch, ["init", "--user", "firstuser", "--yes"])
+    config = parse_config(tmp_path / ".gaia" / "config.toml")
+    assert config["username"] == "firstuser"
+
+    # Second init without --force (should print message and not overwrite)
+    run_cli(monkeypatch, ["init", "--user", "seconduser", "--yes"])
+    output = capsys.readouterr().out
+    assert "Gaia is already initialized in this repository. Use --force to overwrite." in output
+    config = parse_config(tmp_path / ".gaia" / "config.toml")
+    assert config["username"] == "firstuser"  # unchanged
+
+    # Third init with --force (should overwrite)
+    run_cli(monkeypatch, ["init", "--user", "seconduser", "--yes", "--force"])
+    config = parse_config(tmp_path / ".gaia" / "config.toml")
+    assert config["username"] == "seconduser"  # overwritten
+

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/tests/test_intake.py

@@ -1,6 +1,7 @@
 import json
 import os
 import subprocess
+import sys
 import tempfile
 import unittest
 
@@ -15,7 +16,7 @@ def run_validate_intake(intake_dir, *extra_args):
     env["PYTHONIOENCODING"] = "utf-8"
     result = subprocess.run(
         [
-            "python3",
+            sys.executable,
             VALIDATE_INTAKE_SCRIPT,
             "--intake-dir",
             intake_dir,

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/tests/test_path_command.py

@@ -236,23 +236,23 @@ class TestRenderUnlockPath:
     def test_basic_leaf_renders(self, linear_graph):
         text = render_unlock_path(linear_graph, "a", set())
         assert "a" in text
-        # leaf has no children, summary should say 0 owned out of 1
-        assert "0 / 1" in text
+        # leaf has no children, summary should say 0 owned out of 0
+        assert "0 / 0" in text
 
     def test_footer_counts_correct(self, linear_graph):
         text = render_unlock_path(linear_graph, "c", set())
-        # 3 nodes total (a, b, c), 0 owned
-        assert "0 / 3" in text
-        assert "3 skill(s) needed" in text
+        # 2 prerequisites total (a, b), 0 owned
+        assert "0 / 2" in text
+        assert "2 skill(s) needed" in text
 
     def test_footer_with_owned(self, linear_graph):
         # unlock_path stops recursing into owned nodes, so the visible tree
         # for 'c' with owned={'a','b'} is: c(missing) + b(owned, no children).
         # 'a' is not in the tree because b is already owned → recursion stops.
-        # Count: 2 nodes total, 1 owned (b), 1 missing (c).
+        # Count: 1 prerequisite total (b), 1 owned (b).
         text = render_unlock_path(linear_graph, "c", {"a", "b"})
-        assert "1 / 2" in text
-        assert "1 skill(s) needed" in text
+        assert "1 / 1" in text
+        assert "0 skill(s) needed" in text
 
     def test_owned_only_prunes_owned_branches(self, linear_graph):
         """--owned-only prunes the display of owned 'b' from the output."""

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/tests/test_push.py

@@ -37,7 +37,7 @@ class TestGaiaPush(unittest.TestCase):
             env["PYTHONIOENCODING"] = "utf-8"
             result = subprocess.run(
                 [
-                    "python3",
+                    sys.executable,
                     CLI_PATH,
                     "--registry",
                     REPO_ROOT,
@@ -83,7 +83,7 @@ class TestGaiaPush(unittest.TestCase):
             env["PYTHONIOENCODING"] = "utf-8"
             result = subprocess.run(
                 [
-                    "python3",
+                    sys.executable,
                     CLI_PATH,
                     "--registry",
                     registry,

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/tests/test_stats.py

@@ -114,3 +114,23 @@ def test_stats_cli_prints_summary(tmp_path, monkeypatch, capsys):
     assert "Gaia Registry — 4 skills  1 edges" in output
     assert "Class A" in output
     assert "Effective level breakdown" in output
+
+
+def test_collect_stats_missing_level(tmp_path):
+    registry = tmp_path / "registry"
+    registry.mkdir(parents=True, exist_ok=True)
+    (registry / "gaia.json").write_text(
+        json.dumps(
+            {
+                "skills": [
+                    {"id": "tokenize", "type": "basic", "evidence": []},  # No 'level' key
+                ],
+                "edges": [],
+            }
+        ),
+        encoding="utf-8",
+    )
+    stats = collect_stats(tmp_path)
+    assert "?" not in stats["level_counts"]
+    assert "level_counts" in stats
+

{gaia_cli-4.3.5 → gaia_cli-4.3.7}/tests/test_validate.py

@@ -17,7 +17,7 @@ def run_validate(graph_path):
     env = os.environ.copy()
     env["PYTHONIOENCODING"] = "utf-8"
     result = subprocess.run(
-        ["python3", VALIDATE_SCRIPT, "--graph", graph_path],
+        [sys.executable, VALIDATE_SCRIPT, "--graph", graph_path],
         capture_output=True,
         text=True,
         encoding="utf-8",