Support directory tasks in cards

rvctl.py

@@ -53,6 +53,12 @@ class WorkspaceConfig:
     git: GitConfig
 
 
+@dataclass(frozen=True)
+class TaskEntry:
+    name: str
+    path: Path
+
+
 SCOPE_FIELDS = [
     ("a", "activitypub"),
     ("A", "admin"),
@@ -2623,16 +2629,31 @@ def print_key_values(values: dict[str, str]) -> None:
         print(f"{key}\t{value}")
 
 
-def task_names(card_path: Path) -> list[str]:
+def task_name_from_path(path: Path) -> str:
+    if path.is_file():
+        return path.stem
+    return path.name
+
+
+def task_entries(card_path: Path) -> list[TaskEntry]:
+    entries: dict[str, TaskEntry] = {}
     task_root = card_path / "src" / "tasks"
-    if not task_root.is_dir():
-        return []
-    names = {
-        path.stem
-        for path in task_root.iterdir()
-        if path.is_file() and path.stem.startswith("task")
-    }
-    return sorted(names)
+    if task_root.is_dir():
+        for path in sorted(task_root.iterdir()):
+            name = task_name_from_path(path)
+            if (path.is_file() or path.is_dir()) and name.startswith("task"):
+                entries[name] = TaskEntry(name=name, path=path)
+
+    for path in sorted(card_path.iterdir()):
+        name = task_name_from_path(path)
+        if (path.is_file() or path.is_dir()) and name.startswith("task"):
+            entries.setdefault(name, TaskEntry(name=name, path=path))
+
+    return [entries[name] for name in sorted(entries)]
+
+
+def task_names(card_path: Path) -> list[str]:
+    return [entry.name for entry in task_entries(card_path)]
 
 
 def task_branch_part(task_name: str) -> str:
@@ -2733,22 +2754,23 @@ def set_branch_upstream(repo_path: Path, branch_name: str, remote_name: str, dry
 
 def print_card_tasks(config: WorkspaceConfig, series_name: str, card_name: str) -> None:
     card_path = resolve_workspace_card_path(config, series_name, card_name)
-    for task_name in task_names(card_path):
-        print(f"{series_name}\t{card_label_from_repo_name(card_path.name)}\t{task_name}\t{card_path / 'src' / 'tasks'}")
+    for entry in task_entries(card_path):
+        print(f"{series_name}\t{card_label_from_repo_name(card_path.name)}\t{entry.name}\t{entry.path}")
 
 
 def print_card_task(config: WorkspaceConfig, series_name: str, card_name: str, task_name: str) -> None:
     card_path = resolve_workspace_card_path(config, series_name, card_name)
-    matches = [name for name in task_names(card_path) if name == task_name or task_name in name]
+    matches = [entry for entry in task_entries(card_path) if entry.name == task_name or task_name in entry.name]
     if not matches:
         raise SystemExit(f"Missing task '{task_name}' in card: {card_path}")
     if len(matches) > 1:
-        raise SystemExit(f"Ambiguous task '{task_name}'. Matches: {', '.join(matches)}")
+        raise SystemExit(f"Ambiguous task '{task_name}'. Matches: {', '.join(entry.name for entry in matches)}")
+    task_entry = matches[0]
     print(f"series\t{series_name}")
     print(f"card\t{card_label_from_repo_name(card_path.name)}")
-    print(f"task\t{matches[0]}")
+    print(f"task\t{task_entry.name}")
     print(f"card_path\t{card_path}")
-    print(f"task_root\t{card_path / 'src' / 'tasks'}")
+    print(f"task_path\t{task_entry.path}")
 
 
 def switch_card_task(