@mindfoldhq/trellis 0.5.0-beta.9 → 0.5.0-rc.0

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

@@ -1,7 +1,7 @@
 """
 CLI Adapter for Multi-Platform Support.
 
-Abstracts differences between Claude Code, OpenCode, Cursor, iFlow, Codex, Kilo, Kiro Code, Gemini CLI, Antigravity, Windsurf, Qoder, CodeBuddy, GitHub Copilot, and Factory Droid interfaces.
+Abstracts differences between Claude Code, OpenCode, Cursor, iFlow, Codex, Kilo, Kiro Code, Gemini CLI, Antigravity, Windsurf, Qoder, CodeBuddy, GitHub Copilot, Factory Droid, and Pi Agent interfaces.
 
 Supported platforms:
 - claude: Claude Code (default)
@@ -18,6 +18,7 @@ Supported platforms:
 - codebuddy: CodeBuddy
 - copilot: GitHub Copilot (VS Code)
 - droid: Factory Droid (commands-based)
+- pi: Pi Agent (extension-backed)
 
 Usage:
     from common.cli_adapter import CLIAdapter
@@ -51,6 +52,7 @@ Platform = Literal[
     "codebuddy",
     "copilot",
     "droid",
+    "pi",
 ]
 
 
@@ -95,7 +97,7 @@ class CLIAdapter:
         """Get platform-specific config directory name.
 
         Returns:
-            Directory name ('.claude', '.opencode', '.cursor', '.iflow', '.codex', '.kilocode', '.kiro', '.gemini', '.agent', '.windsurf', '.qoder', or '.codebuddy')
+            Directory name ('.claude', '.opencode', '.cursor', '.iflow', '.codex', '.kilocode', '.kiro', '.gemini', '.agent', '.windsurf', '.qoder', '.codebuddy', '.github/copilot', '.factory', or '.pi')
         """
         if self.platform == "opencode":
             return ".opencode"
@@ -123,6 +125,8 @@ class CLIAdapter:
             return ".github/copilot"
         elif self.platform == "droid":
             return ".factory"
+        elif self.platform == "pi":
+            return ".pi"
         else:
             return ".claude"
 
@@ -133,7 +137,7 @@ class CLIAdapter:
             project_root: Project root directory
 
         Returns:
-            Path to config directory (.claude, .opencode, .cursor, .iflow, .codex, .kilocode, .kiro, .gemini, .agent, .windsurf, .qoder, or .codebuddy)
+            Path to config directory (.claude, .opencode, .cursor, .iflow, .codex, .kilocode, .kiro, .gemini, .agent, .windsurf, .qoder, .codebuddy, .github/copilot, .factory, or .pi)
         """
         return project_root / self.config_dir_name
 
@@ -167,8 +171,20 @@ class CLIAdapter:
             Antigravity uses workflow directory: .agent/workflows/<name>.md
             Windsurf uses workflow directory: .windsurf/workflows/trellis-<name>.md
             Copilot uses prompt files: .github/prompts/<name>.prompt.md
+            Pi uses prompt templates: .pi/prompts/trellis-<name>.md
             Claude/OpenCode use subdirectory: .claude/commands/trellis/<name>.md
         """
+        if self.platform == "pi":
+            prompts_dir = self.get_config_dir(project_root) / "prompts"
+            if not parts:
+                return prompts_dir
+            if len(parts) >= 2 and parts[0] == "trellis":
+                filename = parts[-1]
+                if filename.endswith(".md"):
+                    filename = filename[:-3]
+                return prompts_dir / f"trellis-{filename}.md"
+            return prompts_dir / Path(*parts)
+
         if self.platform == "windsurf":
             workflow_dir = self.get_config_dir(project_root) / "workflows"
             if not parts:
@@ -222,19 +238,22 @@ class CLIAdapter:
 
         Note:
             Cursor: .cursor/commands/trellis-<name>.md
-            Codex: .agents/skills/<name>/SKILL.md
-            Kiro: .kiro/skills/<name>/SKILL.md
+            Codex: .agents/skills/trellis-<name>/SKILL.md
+            Kiro: .kiro/skills/trellis-<name>/SKILL.md
             Gemini: .gemini/commands/trellis/<name>.toml
             Antigravity: .agent/workflows/<name>.md
             Windsurf: .windsurf/workflows/trellis-<name>.md
+            Pi: .pi/prompts/trellis-<name>.md
             Others: .{platform}/commands/trellis/<name>.md
         """
         if self.platform == "cursor":
             return f".cursor/commands/trellis-{name}.md"
         elif self.platform == "codex":
-            return f".agents/skills/{name}/SKILL.md"
+            # 0.5.0-beta.0 renamed all skill dirs to add the `trellis-` prefix
+            # (see that release's manifest for the 60+ rename entries).
+            return f".agents/skills/trellis-{name}/SKILL.md"
         elif self.platform == "kiro":
-            return f".kiro/skills/{name}/SKILL.md"
+            return f".kiro/skills/trellis-{name}/SKILL.md"
         elif self.platform == "gemini":
             return f".gemini/commands/trellis/{name}.toml"
         elif self.platform == "antigravity":
@@ -247,6 +266,8 @@ class CLIAdapter:
             return f".github/prompts/{name}.prompt.md"
         elif self.platform == "droid":
             return f".factory/commands/trellis/{name}.md"
+        elif self.platform == "pi":
+            return f".pi/prompts/trellis-{name}.md"
         else:
             return f"{self.config_dir_name}/commands/trellis/{name}.md"
 
@@ -282,6 +303,8 @@ class CLIAdapter:
             return {}
         elif self.platform == "droid":
             return {}
+        elif self.platform == "pi":
+            return {}
         else:
             return {"CLAUDE_NON_INTERACTIVE": "1"}
 
@@ -365,6 +388,8 @@ class CLIAdapter:
             raise ValueError(
                 "Factory Droid CLI agent run is not yet supported."
             )
+        elif self.platform == "pi":
+            cmd = ["pi", "-p", prompt]
 
         else:  # claude
             cmd = ["claude", "-p"]
@@ -429,6 +454,8 @@ class CLIAdapter:
             raise ValueError(
                 "Factory Droid CLI resume is not yet supported."
             )
+        elif self.platform == "pi":
+            return ["pi", "-c", session_id]
         else:
             return ["claude", "--resume", session_id]
 
@@ -501,6 +528,8 @@ class CLIAdapter:
             return "copilot"
         elif self.platform == "droid":
             return "droid"
+        elif self.platform == "pi":
+            return "pi"
         else:
             return "claude"
 
@@ -511,7 +540,7 @@ class CLIAdapter:
         Claude Code, OpenCode, iFlow, and Codex support CLI agent execution.
         Cursor is IDE-only and doesn't support CLI agents.
         """
-        return self.platform in ("claude", "opencode", "iflow", "codex")
+        return self.platform in ("claude", "opencode", "iflow", "codex", "pi")
 
     @property
     def requires_agent_definition_file(self) -> bool:
@@ -565,7 +594,7 @@ def get_cli_adapter(platform: str = "claude") -> CLIAdapter:
     """Get CLI adapter for the specified platform.
 
     Args:
-        platform: Platform name ('claude', 'opencode', 'cursor', 'iflow', 'codex', 'kilo', 'kiro', 'gemini', 'antigravity', 'windsurf', 'qoder', or 'codebuddy')
+        platform: Platform name ('claude', 'opencode', 'cursor', 'iflow', 'codex', 'kilo', 'kiro', 'gemini', 'antigravity', 'windsurf', 'qoder', 'codebuddy', 'copilot', 'droid', or 'pi')
 
     Returns:
         CLIAdapter instance
@@ -588,9 +617,10 @@ def get_cli_adapter(platform: str = "claude") -> CLIAdapter:
         "codebuddy",
         "copilot",
         "droid",
+        "pi",
     ):
         raise ValueError(
-            f"Unsupported platform: {platform} (must be 'claude', 'opencode', 'cursor', 'iflow', 'codex', 'kilo', 'kiro', 'gemini', 'antigravity', 'windsurf', 'qoder', 'codebuddy', 'copilot', or 'droid')"
+            f"Unsupported platform: {platform} (must be 'claude', 'opencode', 'cursor', 'iflow', 'codex', 'kilo', 'kiro', 'gemini', 'antigravity', 'windsurf', 'qoder', 'codebuddy', 'copilot', 'droid', or 'pi')"
         )
 
     return CLIAdapter(platform=platform)  # type: ignore
@@ -601,7 +631,6 @@ _ALL_PLATFORM_CONFIG_DIRS = (
     ".cursor",
     ".iflow",
     ".opencode",
-    ".agents",
     ".codex",
     ".kilocode",
     ".kiro",
@@ -612,8 +641,13 @@ _ALL_PLATFORM_CONFIG_DIRS = (
     ".codebuddy",
     ".github/copilot",
     ".factory",
+    ".pi",
 )
-"""All platform config directory names (used by detect_platform exclusion checks)."""
+"""Platform-specific config directory names used by detect_platform exclusion
+checks. `.agents/skills/` is NOT listed here: it is a shared cross-platform
+layer (written by Codex, also consumed by Amp/Cline/Warp/etc. via the
+agentskills.io standard), not a single-platform signal. Its presence must not
+block detection of Kiro, Antigravity, Windsurf, or other platforms."""
 
 
 def _has_other_platform_dir(project_root: Path, exclude: set[str]) -> bool:
@@ -641,13 +675,14 @@ def detect_platform(project_root: Path) -> Platform:
     10. .windsurf/workflows exists and no other platform dirs → windsurf
     11. .codebuddy directory exists → codebuddy
     12. .qoder directory exists → qoder
-    13. Default → claude
+    13. .pi directory exists → pi
+    14. Default → claude
 
     Args:
         project_root: Project root directory
 
     Returns:
-        Detected platform ('claude', 'opencode', 'cursor', 'iflow', 'codex', 'kilo', 'kiro', 'gemini', 'antigravity', 'windsurf', 'qoder', 'codebuddy', or default 'claude')
+        Detected platform ('claude', 'opencode', 'cursor', 'iflow', 'codex', 'kilo', 'kiro', 'gemini', 'antigravity', 'windsurf', 'qoder', 'codebuddy', 'copilot', 'droid', 'pi', or default 'claude')
     """
     import os
 
@@ -668,6 +703,7 @@ def detect_platform(project_root: Path) -> Platform:
         "codebuddy",
         "copilot",
         "droid",
+        "pi",
     ):
         return env_platform  # type: ignore
 
@@ -737,6 +773,28 @@ def detect_platform(project_root: Path) -> Platform:
     if (project_root / ".factory").is_dir():
         return "droid"
 
+    # Check for .pi directory (Pi Agent-specific)
+    if (project_root / ".pi").is_dir():
+        return "pi"
+
+    # Fallback: checkout only has the Codex shared-skills layer
+    # (.agents/skills/trellis-* dirs) and no explicit platform config dir.
+    # Happens on fresh clones where .codex/ is gitignored/absent but the
+    # shared skills were committed to git. Must guard against the case
+    # where .claude/ or any other platform dir also exists — .agents/skills/
+    # can legitimately coexist with any platform as a shared consumption
+    # layer for Amp/Cline/Warp/etc.
+    agents_skills = project_root / ".agents" / "skills"
+    if agents_skills.is_dir() and not _has_other_platform_dir(
+        project_root, set()
+    ):
+        try:
+            for entry in agents_skills.iterdir():
+                if entry.is_dir() and entry.name.startswith("trellis-"):
+                    return "codex"
+        except OSError:
+            pass
+
     return "claude"
 
 

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

@@ -207,22 +207,8 @@ def count_lines(file_path: Path) -> int:
 # Current Task Management
 # =============================================================================
 
-def _get_current_task_file(repo_root: Path | None = None) -> Path:
-    """Get .current-task file path.
-
-    Args:
-        repo_root: Repository root path. Defaults to auto-detected.
-
-    Returns:
-        Path to .current-task file.
-    """
-    if repo_root is None:
-        repo_root = get_repo_root()
-    return repo_root / DIR_WORKFLOW / FILE_CURRENT_TASK
-
-
 def normalize_task_ref(task_ref: str) -> str:
-    """Normalize a task ref for stable storage in .current-task.
+    """Normalize a task ref for stable runtime storage.
 
     Stored refs should prefer repo-relative POSIX paths like
     `.trellis/tasks/03-27-my-task`, even on Windows. Absolute paths are preserved
@@ -247,7 +233,7 @@ def normalize_task_ref(task_ref: str) -> str:
 
 
 def resolve_task_ref(task_ref: str, repo_root: Path | None = None) -> Path | None:
-    """Resolve a task ref from .current-task to an absolute task directory path."""
+    """Resolve a task ref to an absolute task directory path."""
     if repo_root is None:
         repo_root = get_repo_root()
 
@@ -265,7 +251,11 @@ def resolve_task_ref(task_ref: str, repo_root: Path | None = None) -> Path | Non
     return repo_root / DIR_WORKFLOW / DIR_TASKS / path_obj
 
 
-def get_current_task(repo_root: Path | None = None) -> str | None:
+def get_current_task(
+    repo_root: Path | None = None,
+    platform_input: dict | None = None,
+    platform: str | None = None,
+) -> str | None:
     """Get current task directory path (relative to repo_root).
 
     Args:
@@ -274,19 +264,19 @@ def get_current_task(repo_root: Path | None = None) -> str | None:
     Returns:
         Relative path to current task directory or None.
     """
-    current_file = _get_current_task_file(repo_root)
+    if repo_root is None:
+        repo_root = get_repo_root()
 
-    if not current_file.is_file():
-        return None
+    from .active_task import resolve_active_task
 
-    try:
-        content = current_file.read_text(encoding="utf-8").strip()
-        return normalize_task_ref(content) if content else None
-    except (OSError, IOError):
-        return None
+    return resolve_active_task(repo_root, platform_input, platform).task_path
 
 
-def get_current_task_abs(repo_root: Path | None = None) -> Path | None:
+def get_current_task_abs(
+    repo_root: Path | None = None,
+    platform_input: dict | None = None,
+    platform: str | None = None,
+) -> Path | None:
     """Get current task directory absolute path.
 
     Args:
@@ -298,14 +288,33 @@ def get_current_task_abs(repo_root: Path | None = None) -> Path | None:
     if repo_root is None:
         repo_root = get_repo_root()
 
-    relative = get_current_task(repo_root)
+    relative = get_current_task(repo_root, platform_input, platform)
     if relative:
         return resolve_task_ref(relative, repo_root)
     return None
 
 
-def set_current_task(task_path: str, repo_root: Path | None = None) -> bool:
-    """Set current task.
+def get_current_task_source(
+    repo_root: Path | None = None,
+    platform_input: dict | None = None,
+    platform: str | None = None,
+) -> tuple[str, str | None, str | None]:
+    """Get active task source as (`source`, `context_key`, `task_path`)."""
+    if repo_root is None:
+        repo_root = get_repo_root()
+
+    from .active_task import get_current_task_source as _get_source
+
+    return _get_source(repo_root, platform_input, platform)
+
+
+def set_current_task(
+    task_path: str,
+    repo_root: Path | None = None,
+    platform_input: dict | None = None,
+    platform: str | None = None,
+) -> bool:
+    """Set current task in session scope.
 
     Args:
         task_path: Task directory path (relative to repo_root).
@@ -317,31 +326,22 @@ def set_current_task(task_path: str, repo_root: Path | None = None) -> bool:
     if repo_root is None:
         repo_root = get_repo_root()
 
-    normalized = normalize_task_ref(task_path)
-    if not normalized:
-        return False
+    from .active_task import set_active_task
 
-    # Verify task directory exists
-    full_path = resolve_task_ref(normalized, repo_root)
-    if full_path is None or not full_path.is_dir():
-        return False
+    return set_active_task(
+        task_path,
+        repo_root,
+        platform_input=platform_input,
+        platform=platform,
+    ) is not None
 
-    try:
-        normalized = full_path.relative_to(repo_root).as_posix()
-    except ValueError:
-        normalized = str(full_path)
 
-    current_file = _get_current_task_file(repo_root)
-
-    try:
-        current_file.write_text(normalized, encoding="utf-8")
-        return True
-    except (OSError, IOError):
-        return False
-
-
-def clear_current_task(repo_root: Path | None = None) -> bool:
-    """Clear current task.
+def clear_current_task(
+    repo_root: Path | None = None,
+    platform_input: dict | None = None,
+    platform: str | None = None,
+) -> bool:
+    """Clear current task in session scope.
 
     Args:
         repo_root: Repository root path. Defaults to auto-detected.
@@ -349,14 +349,17 @@ def clear_current_task(repo_root: Path | None = None) -> bool:
     Returns:
         True on success.
     """
-    current_file = _get_current_task_file(repo_root)
+    if repo_root is None:
+        repo_root = get_repo_root()
 
-    try:
-        if current_file.is_file():
-            current_file.unlink()
-        return True
-    except (OSError, IOError):
-        return False
+    from .active_task import clear_active_task
+
+    clear_active_task(
+        repo_root,
+        platform_input=platform_input,
+        platform=platform,
+    )
+    return True
 
 
 def has_current_task(repo_root: Path | None = None) -> bool:

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

@@ -29,6 +29,7 @@ from .paths import (
     count_lines,
     get_active_journal_file,
     get_current_task,
+    get_current_task_source,
     get_developer,
     get_repo_root,
     get_tasks_dir,
@@ -279,7 +280,11 @@ def get_context_text(repo_root: Path | None = None) -> str:
     current_task = get_current_task(repo_root)
     if current_task:
         current_task_dir = repo_root / current_task
+        source_type, context_key, _ = get_current_task_source(repo_root)
         lines.append(f"Path: {current_task}")
+        lines.append(
+            f"Source: {source_type}" + (f":{context_key}" if context_key else "")
+        )
 
         ct = load_task(current_task_dir)
         if ct:
@@ -429,12 +434,15 @@ def get_context_record_json(repo_root: Path | None = None) -> dict:
     current_task_info = None
     current_task = get_current_task(repo_root)
     if current_task:
+        source_type, context_key, _ = get_current_task_source(repo_root)
         ct = load_task(repo_root / current_task)
         if ct:
             current_task_info = {
                 "path": current_task,
                 "name": ct.name,
                 "status": ct.status,
+                "source": source_type,
+                "contextKey": context_key,
             }
 
     # Package git repos
@@ -539,7 +547,11 @@ def get_context_text_record(repo_root: Path | None = None) -> str:
     lines.append("## CURRENT TASK")
     current_task = get_current_task(repo_root)
     if current_task:
+        source_type, context_key, _ = get_current_task_source(repo_root)
         lines.append(f"Path: {current_task}")
+        lines.append(
+            f"Source: {source_type}" + (f":{context_key}" if context_key else "")
+        )
         ct = load_task(repo_root / current_task)
         if ct:
             lines.append(f"Name: {ct.name}")