@mindfoldhq/trellis 0.4.0-beta.3 → 0.4.0-beta.4

package/dist/migrations/manifests/0.4.0-beta.4.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.4.0-beta.4",
+  "description": "Git repo context for monorepo packages + improved init-context hints",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "**Enhancements:**\n- feat(context): show git status and recent commits for independent sub-repo packages (config `git: true`)\n- feat(task): init-context now lists auto-injected defaults and available spec files to guide AI agents\n- feat(commands): add /trellis:publish-skill slash command\n- feat(marketplace): add cc-codex-spec-bootstrap skill\n\n**Bug Fixes:**\n- fix(context): use _is_true_config_value for isGitRepo consistency (case-insensitive)",
+  "migrations": [],
+  "notes": "Run `trellis update` to sync. Projects with independent git sub-repos can now add `git: true` to package config to see their status in session context."
+}

package/dist/templates/trellis/scripts/common/config.py

@@ -21,6 +21,15 @@ DEFAULT_MAX_JOURNAL_LINES = 2000
 CONFIG_FILE = "config.yaml"
 
 
+def _is_true_config_value(value: object) -> bool:
+    """Return True when a config value represents an enabled flag."""
+    if isinstance(value, bool):
+        return value
+    if isinstance(value, str):
+        return value.strip().lower() == "true"
+    return False
+
+
 def _get_config_path(repo_root: Path | None = None) -> Path:
     """Get path to config.yaml."""
     root = repo_root or get_repo_root()
@@ -130,6 +139,37 @@ def get_submodule_packages(repo_root: Path | None = None) -> dict[str, str]:
     }
 
 
+def get_git_packages(repo_root: Path | None = None) -> dict[str, str]:
+    """Get packages that have their own independent git repository.
+
+    These are sub-directories with their own .git (not submodules),
+    marked with ``git: true`` in config.yaml.
+
+    Returns:
+        Dict mapping package name to its path for git-repo packages.
+        Empty dict if none configured.
+
+    Example config::
+
+        packages:
+          backend:
+            path: iqs
+            git: true
+
+    Example return::
+
+        {"backend": "iqs"}
+    """
+    packages = get_packages(repo_root)
+    if packages is None:
+        return {}
+    return {
+        name: cfg.get("path", name)
+        for name, cfg in packages.items()
+        if _is_true_config_value(cfg.get("git"))
+    }
+
+
 def is_monorepo(repo_root: Path | None = None) -> bool:
     """Check if the project is configured as a monorepo (has packages in config)."""
     return get_packages(repo_root) is not None

package/dist/templates/trellis/scripts/common/packages_context.py

@@ -13,7 +13,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from .config import get_default_package, get_packages, get_spec_scope
+from .config import _is_true_config_value, get_default_package, get_packages, get_spec_scope
 from .paths import (
     DIR_SPEC,
     DIR_WORKFLOW,
@@ -91,7 +91,8 @@ def _resolve_scope_set(
 def get_packages_info(repo_root: Path) -> list[dict]:
     """Get structured package info for monorepo projects.
 
-    Returns list of dicts with keys: name, path, type, default, specLayers, isSubmodule.
+    Returns list of dicts with keys: name, path, type, default, specLayers,
+    isSubmodule, isGitRepo.
     Returns empty list for single-repo projects.
     """
     packages = get_packages(repo_root)
@@ -105,6 +106,7 @@ def get_packages_info(repo_root: Path) -> list[dict]:
     for pkg_name, pkg_config in packages.items():
         pkg_path = pkg_config.get("path", pkg_name) if isinstance(pkg_config, dict) else str(pkg_config)
         pkg_type = pkg_config.get("type", "local") if isinstance(pkg_config, dict) else "local"
+        pkg_git = pkg_config.get("git", False) if isinstance(pkg_config, dict) else False
         layers = _scan_spec_layers(spec_dir, pkg_name)
 
         result.append({
@@ -114,6 +116,7 @@ def get_packages_info(repo_root: Path) -> list[dict]:
             "default": pkg_name == default_pkg,
             "specLayers": layers,
             "isSubmodule": pkg_type == "submodule",
+            "isGitRepo": _is_true_config_value(pkg_git),
         })
 
     return result
@@ -139,9 +142,10 @@ def get_packages_section(repo_root: Path) -> str:
     for pkg in pkg_info:
         layers_str = f"  [{', '.join(pkg['specLayers'])}]" if pkg["specLayers"] else ""
         submodule_tag = "  (submodule)" if pkg["isSubmodule"] else ""
+        git_repo_tag = "  (git repo)" if pkg["isGitRepo"] else ""
         default_tag = "  *" if pkg["default"] else ""
         lines.append(
-            f"- {pkg['name']:<16} {pkg['path']:<20}{layers_str}{submodule_tag}{default_tag}"
+            f"- {pkg['name']:<16} {pkg['path']:<20}{layers_str}{submodule_tag}{git_repo_tag}{default_tag}"
         )
 
     if default_pkg:
@@ -179,13 +183,14 @@ def get_context_packages_text(repo_root: Path | None = None) -> str:
     for pkg in pkg_info:
         default_tag = " (default)" if pkg["default"] else ""
         type_tag = f" [{pkg['type']}]" if pkg["type"] != "local" else ""
+        git_tag = " [git repo]" if pkg["isGitRepo"] else ""
 
         # Scope annotation
         scope_tag = ""
         if scope_set is not None and pkg["name"] not in scope_set:
             scope_tag = " (out of scope)"
 
-        lines.append(f"### {pkg['name']}{default_tag}{type_tag}{scope_tag}")
+        lines.append(f"### {pkg['name']}{default_tag}{type_tag}{git_tag}{scope_tag}")
         lines.append(f"Path: {pkg['path']}")
         if pkg["specLayers"]:
             lines.append(f"Spec layers: {', '.join(pkg['specLayers'])}")

package/dist/templates/trellis/scripts/common/session_context.py

@@ -16,6 +16,7 @@ from __future__ import annotations
 import json
 from pathlib import Path
 
+from .config import get_git_packages
 from .git import run_git
 from .packages_context import get_packages_section
 from .tasks import iter_active_tasks, load_task, get_all_statuses, children_progress
@@ -34,6 +35,79 @@ from .paths import (
 )
 
 
+# =============================================================================
+# Helpers
+# =============================================================================
+
+def _collect_package_git_info(repo_root: Path) -> list[dict]:
+    """Collect git status and recent commits for packages with independent git repos.
+
+    Only packages marked with ``git: true`` in config.yaml are included.
+
+    Returns:
+        List of dicts with keys: name, path, branch, isClean,
+        uncommittedChanges, recentCommits.
+        Empty list if no git-repo packages are configured.
+    """
+    git_pkgs = get_git_packages(repo_root)
+    if not git_pkgs:
+        return []
+
+    result = []
+    for pkg_name, pkg_path in git_pkgs.items():
+        pkg_dir = repo_root / pkg_path
+        if not (pkg_dir / ".git").exists():
+            continue
+
+        _, branch_out, _ = run_git(["branch", "--show-current"], cwd=pkg_dir)
+        branch = branch_out.strip() or "unknown"
+
+        _, status_out, _ = run_git(["status", "--porcelain"], cwd=pkg_dir)
+        changes = len([l for l in status_out.splitlines() if l.strip()])
+
+        _, log_out, _ = run_git(["log", "--oneline", "-5"], cwd=pkg_dir)
+        commits = []
+        for line in log_out.splitlines():
+            if line.strip():
+                parts = line.split(" ", 1)
+                if len(parts) >= 2:
+                    commits.append({"hash": parts[0], "message": parts[1]})
+                elif len(parts) == 1:
+                    commits.append({"hash": parts[0], "message": ""})
+
+        result.append({
+            "name": pkg_name,
+            "path": pkg_path,
+            "branch": branch,
+            "isClean": changes == 0,
+            "uncommittedChanges": changes,
+            "recentCommits": commits,
+        })
+
+    return result
+
+
+def _append_package_git_context(lines: list[str], package_git_info: list[dict]) -> None:
+    """Append Git status and recent commits for package repositories."""
+    for pkg in package_git_info:
+        lines.append(f"## GIT STATUS ({pkg['name']}: {pkg['path']})")
+        lines.append(f"Branch: {pkg['branch']}")
+        if pkg["isClean"]:
+            lines.append("Working directory: Clean")
+        else:
+            lines.append(
+                f"Working directory: {pkg['uncommittedChanges']} uncommitted change(s)"
+            )
+        lines.append("")
+        lines.append(f"## RECENT COMMITS ({pkg['name']}: {pkg['path']})")
+        if pkg["recentCommits"]:
+            for commit in pkg["recentCommits"]:
+                lines.append(f"{commit['hash']} {commit['message']}")
+        else:
+            lines.append("(no commits)")
+        lines.append("")
+
+
 # =============================================================================
 # JSON Output
 # =============================================================================
@@ -93,7 +167,10 @@ def get_context_json(repo_root: Path | None = None) -> dict:
         for t in iter_active_tasks(tasks_dir)
     ]
 
-    return {
+    # Package git repos (independent sub-repositories)
+    pkg_git_info = _collect_package_git_info(repo_root)
+
+    result = {
         "developer": developer or "",
         "git": {
             "branch": branch,
@@ -112,6 +189,11 @@ def get_context_json(repo_root: Path | None = None) -> dict:
         },
     }
 
+    if pkg_git_info:
+        result["packageGit"] = pkg_git_info
+
+    return result
+
 
 def output_json(repo_root: Path | None = None) -> None:
     """Output context in JSON format.
@@ -189,6 +271,9 @@ def get_context_text(repo_root: Path | None = None) -> str:
         lines.append("(no commits)")
     lines.append("")
 
+    # Package git repos — independent sub-repositories
+    _append_package_git_context(lines, _collect_package_git_info(repo_root))
+
     # Current task
     lines.append("## CURRENT TASK")
     current_task = get_current_task(repo_root)
@@ -352,7 +437,10 @@ def get_context_record_json(repo_root: Path | None = None) -> dict:
                 "status": ct.status,
             }
 
-    return {
+    # Package git repos
+    pkg_git_info = _collect_package_git_info(repo_root)
+
+    result = {
         "developer": developer or "",
         "git": {
             "branch": branch,
@@ -364,6 +452,11 @@ def get_context_record_json(repo_root: Path | None = None) -> dict:
         "currentTask": current_task_info,
     }
 
+    if pkg_git_info:
+        result["packageGit"] = pkg_git_info
+
+    return result
+
 
 def get_context_text_record(repo_root: Path | None = None) -> str:
     """Get context as formatted text for record-session mode.
@@ -439,6 +532,9 @@ def get_context_text_record(repo_root: Path | None = None) -> str:
         lines.append("(no commits)")
     lines.append("")
 
+    # Package git repos — independent sub-repositories
+    _append_package_git_context(lines, _collect_package_git_info(repo_root))
+
     # CURRENT TASK
     lines.append("## CURRENT TASK")
     current_task = get_current_task(repo_root)

package/dist/templates/trellis/scripts/common/task_context.py

@@ -194,8 +194,34 @@ def cmd_init_context(args: argparse.Namespace) -> int:
     print()
     print(colored("✓ All context files created", Colors.GREEN))
     print()
+
+    # Show what was auto-injected
+    all_injected = [e["file"] for e in implement_entries]
+    print(colored("Auto-injected (defaults only):", Colors.YELLOW))
+    for f in all_injected:
+        print(f"  - {f}")
+    print()
+
+    # Scan spec directory for available spec files the AI should consider
+    spec_base = repo_root / DIR_WORKFLOW / DIR_SPEC
+    if package:
+        spec_base = spec_base / package
+    available_specs: list[str] = []
+    if spec_base.is_dir():
+        for md_file in sorted(spec_base.rglob("*.md")):
+            rel = str(md_file.relative_to(repo_root))
+            if rel not in all_injected:
+                available_specs.append(rel)
+
+    if available_specs:
+        print(colored("Available spec files (not yet injected):", Colors.BLUE))
+        for spec in available_specs:
+            print(f"  - {spec}")
+        print()
+
     print(colored("Next steps:", Colors.BLUE))
-    print("  1. Add task-specific specs: python3 task.py add-context <dir> <jsonl> <path>")
+    print("  1. Review the spec files above and add relevant ones for your task:")
+    print(f"     python3 task.py add-context <dir> implement <spec-path> \"<reason>\"")
     print("  2. Set as current: python3 task.py start <dir>")
 
     return 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindfoldhq/trellis",
-  "version": "0.4.0-beta.3",
+  "version": "0.4.0-beta.4",
   "description": "AI capabilities grow like ivy — Trellis provides the structure to guide them along a disciplined path",
   "type": "module",
   "main": "./dist/index.js",