@pennixrv/trellis 0.7.1-beta.5 → 0.7.1-beta.7

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

@@ -0,0 +1,345 @@
+"""Recoverable task relocation shared by lifecycle commands and explicit migration."""
+
+from __future__ import annotations
+
+import argparse
+import contextlib
+import hashlib
+import json
+import sys
+from pathlib import Path
+
+from .io import read_json_checked, write_json, write_text_atomic
+from .paths import get_repo_root, get_tasks_dir
+from .task_layout import MONTH_RE, iter_task_dirs, task_location, task_status_dir
+
+_LOCK_DEPTH = 0
+_APPLYING = False
+
+
+def journal_path(root: Path) -> Path:
+    return root / ".trellis/.runtime/task-layout-transaction.json"
+
+
+def require_settled_layout(root: Path) -> None:
+    if not _APPLYING and journal_path(root).exists():
+        raise ValueError("Task relocation requires recovery: run task.py migrate-layout --recover")
+
+
+@contextlib.contextmanager
+def layout_lock(root: Path):
+    # Reentrant within one process; all task/pointer writers take this before record locks.
+    global _LOCK_DEPTH
+    from .task_continuity import _record_lock
+
+    if _LOCK_DEPTH:
+        _LOCK_DEPTH += 1
+        try:
+            yield
+        finally:
+            _LOCK_DEPTH -= 1
+        return
+    with _record_lock(root / ".trellis/.runtime/task-layout.json"):
+        _LOCK_DEPTH = 1
+        try:
+            yield
+        finally:
+            _LOCK_DEPTH = 0
+
+
+def _read(path: Path) -> dict:
+    data, reason = read_json_checked(path)
+    if data is None:
+        raise ValueError(f"Cannot read {path}: {reason}")
+    return data
+
+
+def _json(data: object) -> str:
+    return json.dumps(data, indent=2, ensure_ascii=False) + "\n"
+
+
+def _rewrite(value, mapping: dict[str, str]):
+    if isinstance(value, str):
+        for old, new in mapping.items():
+            if value == old or value.startswith(old + "/"):
+                return new + value[len(old):]
+        return value
+    if isinstance(value, list):
+        return [_rewrite(item, mapping) for item in value]
+    if isinstance(value, dict):
+        return {key: _rewrite(item, mapping) for key, item in value.items()}
+    return value
+
+
+def _safe_path(root: Path, relative: str) -> Path:
+    path = root / relative
+    if not relative or Path(relative).is_absolute() or ".." in Path(relative).parts:
+        raise ValueError(f"Unsafe relocation path: {relative}")
+    # The tasks root may itself be shared; descendants must never be symlinks.
+    allowed = get_tasks_dir(root) if Path(relative).parts[:2] == (".trellis", "tasks") else root / ".trellis"
+    path.resolve().relative_to(allowed.resolve())
+    current = root / ".trellis"
+    for part in Path(relative).parts[1:]:
+        current /= part
+        if current != get_tasks_dir(root) and current.is_symlink():
+            raise ValueError(f"Symlink in relocation input: {current}")
+    return path
+
+
+def _plan(root: Path, moves: list[tuple[Path, Path]], updates: dict[Path, dict]) -> dict:
+    from .active_task import resolve_active_task
+    from .task_continuity import _load_owner, _ownership_path
+
+    mapping = {old.relative_to(root).as_posix(): new.relative_to(root).as_posix() for old, new in moves if old != new}
+    rewrites = {**mapping, **{str(root / old): str(root / new) for old, new in mapping.items()}}
+    destinations = list(mapping.values())
+    if len(set(destinations)) != len(destinations):
+        raise ValueError("Two tasks have the same destination; nothing moved")
+    for old, new in mapping.items():
+        source, target = _safe_path(root, old), _safe_path(root, new)
+        if not source.is_dir() or target.exists():
+            raise ValueError(f"Missing source or destination conflict: {old} -> {new}")
+        for path in source.rglob("*"):
+            if path.is_symlink():
+                raise ValueError(f"Symlink in task content: {path}")
+            if path.is_file():
+                path.read_bytes()
+            elif not path.is_dir():
+                raise ValueError(f"Unsupported task content: {path}")
+        data = _read(source / "task.json")
+        meta = data.get("meta")
+        delegated = meta.get("delegated_worktree_execution_record") if isinstance(meta, dict) else None
+        if delegated is not None:
+            from .task_workflow import _assert_delegated_record_closed
+            _assert_delegated_record_closed(source.name, delegated)
+        owner = _load_owner(_ownership_path(root, old))
+        if owner:
+            active = resolve_active_task(root)
+            if owner["task_id"] != (data.get("id") or data.get("name")) or owner["task_path"] != old or owner["status"] != "consumed" or active.context_key != owner["target_session_id"] or active.task_path != old:
+                raise ValueError(f"Task ownership prevents relocation: {old}")
+
+    before: dict[str, str | None] = {}
+    after: dict[str, str | None] = {}
+
+    def change(path: Path, text: str | None):
+        relative = path.relative_to(root).as_posix()
+        _safe_path(root, relative)
+        original = path.read_text(encoding="utf-8") if path.exists() else None
+        if original != text:
+            before[relative], after[relative] = original, text
+
+    directories = iter_task_dirs(get_tasks_dir(root), legacy=True) if mapping else iter(updates)
+    for directory in directories:
+        data = updates.get(directory, _read(directory / "task.json"))
+        replacement = _rewrite(data, rewrites)
+        if directory in updates or replacement != data:
+            change(directory / "task.json", _json(replacement))
+        for path in sorted(directory.glob("*.jsonl")):
+            lines = path.read_text(encoding="utf-8").splitlines(keepends=True)
+            changed = False
+            for index, line in enumerate(lines):
+                if not line.strip():
+                    continue
+                record = json.loads(line)
+                updated = _rewrite(record, rewrites)
+                if updated != record:
+                    lines[index] = json.dumps(updated, ensure_ascii=False) + "\n"
+                    changed = True
+            if changed:
+                change(path, "".join(lines))
+
+    runtime = root / ".trellis/.runtime"
+    terminal = {directory.relative_to(root).as_posix() for directory, data in updates.items()
+                if data.get("status") in {"completed", "cancelled"}}
+    terminal_hashes = {hashlib.sha256(ref.encode()).hexdigest() for ref in terminal}
+    terminal_refs = terminal | {str(root / ref) for ref in terminal}
+    for folder in ("sessions", "continuity", "task-ownership"):
+        for path in sorted((runtime / folder).glob("*.json")):
+            record = _read(path)
+            if (folder == "sessions" and record.get("current_task") in terminal_refs) or (
+                folder != "sessions" and path.stem in terminal_hashes
+            ):
+                change(path, None)
+                continue
+            updated = _rewrite(record, rewrites)
+            target = path
+            if folder != "sessions":
+                for old, new in mapping.items():
+                    if path.stem == hashlib.sha256(old.encode()).hexdigest():
+                        target = path.with_name(hashlib.sha256(new.encode()).hexdigest() + ".json")
+                        if target.exists():
+                            raise ValueError(f"Runtime destination conflict: {target}")
+                        break
+            if target != path:
+                change(path, None)
+                change(target, _json(updated))
+            elif updated != record:
+                change(path, _json(updated))
+    return {"schema_version": 1, "state": "pending", "moves": mapping, "before": before, "after": after}
+
+
+def _write(path: Path, text: str | None) -> None:
+    if text is None:
+        path.unlink(missing_ok=True)
+    else:
+        path.parent.mkdir(parents=True, exist_ok=True)
+        if not write_text_atomic(path, text):
+            raise OSError(f"Cannot write {path}")
+
+
+def recover_layout(root: Path) -> None:
+    path = _safe_path(root, journal_path(root).relative_to(root).as_posix())
+    if not path.exists():
+        return
+    journal = _read(path)
+    if journal.get("schema_version") != 1 or journal.get("state") not in {"pending", "committed"}:
+        raise ValueError("Invalid task relocation recovery record")
+    if not all(isinstance(journal.get(key), dict) for key in ("moves", "before", "after")) or set(journal["before"]) != set(journal["after"]):
+        raise ValueError("Invalid task relocation recovery inputs")
+    def task_path(relative):
+        if not isinstance(relative, str):
+            raise ValueError("Invalid recovery task path")
+        candidate = _safe_path(root, relative)
+        parts = candidate.relative_to(get_tasks_dir(root)).parts
+        if not (len(parts) == 1 or task_status_dir(candidate, get_tasks_dir(root)) or (
+            len(parts) == 3 and parts[0] == "archive" and MONTH_RE.fullmatch(parts[1])
+        )):
+            raise ValueError(f"Invalid recovery task directory: {relative}")
+        task_location(get_tasks_dir(root), candidate.name, "planning")
+        return candidate
+
+    if not all(isinstance(old, str) and isinstance(new, str) for old, new in journal["moves"].items()):
+        raise ValueError("Invalid recovery moves")
+    sources, targets = set(journal["moves"]), set(journal["moves"].values())
+    if len(targets) != len(journal["moves"]) or sources & targets:
+        raise ValueError("Conflicting recovery moves")
+    for old, new in journal["moves"].items():
+        task_path(old)
+        if not task_status_dir(task_path(new), get_tasks_dir(root)):
+            raise ValueError(f"Invalid recovery destination: {new}")
+    for relative, original in journal["before"].items():
+        if not isinstance(relative, str) or any(value is not None and not isinstance(value, str)
+                for value in (original, journal["after"][relative])):
+            raise ValueError("Invalid recovery file input")
+        candidate = _safe_path(root, relative)
+        parts = Path(relative).parts
+        if parts[:2] == (".trellis", "tasks"):
+            task_path(candidate.parent.relative_to(root).as_posix())
+            if candidate.name != "task.json" and candidate.suffix != ".jsonl":
+                raise ValueError(f"Invalid recovery task file: {relative}")
+        elif not (len(parts) == 4 and parts[:2] == (".trellis", ".runtime")
+                  and parts[2] in {"sessions", "continuity", "task-ownership"} and candidate.suffix == ".json"):
+            raise ValueError(f"Recovery file is outside the task transaction: {relative}")
+    if journal["state"] == "pending":
+        moved = {}
+        for old, new in journal["moves"].items():
+            source, target = root / old, root / new
+            if source.is_dir() == target.is_dir():
+                raise ValueError(f"Recovery conflict: {old} / {new}; preserve both for inspection")
+            if target.exists():
+                moved[old] = new
+        for relative, original in journal["before"].items():
+            current_relative = _rewrite(relative, moved)
+            if not isinstance(current_relative, str):
+                raise ValueError("Invalid recovery file path")
+            current_path = root / current_relative
+            current = current_path.read_text(encoding="utf-8") if current_path.exists() else None
+            if current not in (original, journal["after"][relative]):
+                raise ValueError(f"Recovery input changed: {relative}; no overwrite")
+        for old, new in reversed(list(moved.items())):
+            source = root / old
+            source.parent.mkdir(parents=True, exist_ok=True)
+            (root / new).rename(source)
+        for relative, original in journal["before"].items():
+            _write(root / relative, original)
+    path.unlink()
+
+
+def apply_plan(root: Path, plan: dict) -> None:
+    global _APPLYING
+    require_settled_layout(root)
+    if not plan["moves"] and not plan["before"]:
+        return
+    transaction = _safe_path(root, journal_path(root).relative_to(root).as_posix())
+    transaction.parent.mkdir(parents=True, exist_ok=True)
+    if not write_json(transaction, plan):
+        raise OSError("Cannot save task relocation recovery record")
+    _APPLYING = True
+    try:
+        for relative, text in plan["after"].items():
+            _write(root / relative, text)
+        for old, new in plan["moves"].items():
+            target = root / new
+            target.parent.mkdir(parents=True, exist_ok=True)
+            (root / old).rename(target)
+        plan["state"] = "committed"
+        if not write_json(journal_path(root), plan):
+            raise OSError("Cannot commit task relocation")
+        journal_path(root).unlink()
+    except BaseException:
+        recover_layout(root)
+        raise
+    finally:
+        _APPLYING = False
+    archive = get_tasks_dir(root) / "archive"
+    if archive.is_dir():
+        for month in sorted(archive.iterdir()):
+            if month.is_dir() and not any(month.iterdir()):
+                month.rmdir()
+        if not any(archive.iterdir()):
+            archive.rmdir()
+
+
+def relocate_task(root: Path, directory: Path, data: dict) -> Path:
+    """Change lifecycle status and location together; do not grant workflow authorization."""
+    destination = task_location(get_tasks_dir(root), directory.name, data["status"])
+    if data["status"] == "completed" and task_status_dir(directory, get_tasks_dir(root)) == "completed":
+        destination = directory
+    with layout_lock(root):
+        require_settled_layout(root)
+        plan = _plan(root, [(directory, destination)], {directory: data})
+        apply_plan(root, plan)
+    return destination
+
+
+def cmd_migrate_layout(args: argparse.Namespace) -> int:
+    root = get_repo_root()
+    try:
+        with layout_lock(root):
+            if args.recover:
+                recover_layout(root)
+                print(json.dumps({"status": "recovered"}))
+                return 0
+            require_settled_layout(root)
+            tasks = get_tasks_dir(root)
+            moves: list[tuple[Path, Path]] = []
+            names: set[str] = set()
+            for directory in iter_task_dirs(tasks, legacy=True):
+                data = _read(directory / "task.json")
+                if directory.name in names:
+                    raise ValueError(f"Duplicate task directory name: {directory.name}")
+                names.add(directory.name)
+                status = data.get("status")
+                if not isinstance(status, str):
+                    raise ValueError(f"Task status is missing: {directory}")
+                month = None
+                if status == "completed":
+                    relative = directory.relative_to(tasks).parts
+                    if len(relative) == 3 and relative[0] in {"archive", "completed"} and MONTH_RE.fullmatch(relative[1]):
+                        month = relative[1]
+                    elif isinstance(data.get("completedAt"), str) and MONTH_RE.fullmatch(data["completedAt"][:7]):
+                        month = data["completedAt"][:7]
+                    else:
+                        raise ValueError(f"Completion month is missing: {directory}")
+                target = task_location(tasks, directory.name, status, month)
+                if directory != target:
+                    moves.append((directory, target))
+            plan = _plan(root, moves, {})
+            result = {"status": "applied" if args.apply else "preview", "moves": plan["moves"], "changed_files": sorted(plan["before"])}
+            if args.apply:
+                apply_plan(root, plan)
+            print(json.dumps(result, ensure_ascii=False))
+            return 0
+    except (ValueError, OSError, RuntimeError) as error:
+        print(f"TASK_LAYOUT_WITHHELD: {error}", file=sys.stderr)
+        return 1

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

@@ -443,8 +443,14 @@ def cmd_create(args: argparse.Namespace) -> int:
             return 1
 
     dir_name = f"{date_prefix}-{slug}"
-    task_dir = tasks_dir / dir_name
+    from .task_layout import task_location
+    task_dir = task_location(tasks_dir, dir_name, "planning")
     task_json_path = task_dir / FILE_TASK_JSON
+    from .task_layout import iter_task_dirs
+    conflicts = [directory for directory in iter_task_dirs(tasks_dir) if directory.name == dir_name and directory != task_dir]
+    if conflicts:
+        print(f"Error: Task already exists outside planning: {dir_name}; use its lifecycle commands", file=sys.stderr)
+        return 1
 
     # Reusing a slug on the same day is an ordinary accident, and continuing
     # would rewrite the existing task.json below — resetting status, children,
@@ -691,7 +697,7 @@ def cmd_create(args: argparse.Namespace) -> int:
     print("", file=sys.stderr)
 
     # Output relative path for script chaining
-    print(f"{DIR_WORKFLOW}/{DIR_TASKS}/{dir_name}")
+    print(task_dir.relative_to(repo_root).as_posix())
 
     run_task_hooks("after_create", task_json_path, repo_root)
     return 0
@@ -841,7 +847,8 @@ def _plan_backrefs(
     changes: list[tuple[Path, dict, list[str]]] = []
     unreadable: list[Path] = []
 
-    for candidate in sorted(tasks_dir.iterdir()):
+    from .task_layout import iter_task_dirs
+    for candidate in iter_task_dirs(tasks_dir):
         if not candidate.is_dir():
             continue
         if candidate == task_dir:
@@ -964,62 +971,27 @@ def _rename_interrupted(plan: _RenamePlan) -> None:
 
 
 def _apply_rename(plan: _RenamePlan, repo_root: Path) -> int:
-    """Write the planned change set.
+    """Apply rename through the same recoverable transaction as status moves."""
+    from .task_move import _plan, apply_plan
 
-    The directory move goes last on purpose. Everything before it is an
-    in-place edit that re-running the identical command recomputes as
-    already-done, so an interruption leaves a tree that the same command
-    finishes; a move-first ordering would instead leave the old name
-    unresolvable and the remaining edits to be made by hand.
-    """
     if not _task_mutation_allowed(repo_root, plan.task_dir, plan.task_data):
         return 1
     if plan.identity and not _task_identity_change_allowed(repo_root, plan.task_dir, plan.task_data):
         return 1
-    if plan.identity:
-        data = dict(plan.task_data)
-        for field_name, _old_value, new_value in plan.identity:
-            data[field_name] = new_value
-        if not write_json(plan.task_json_path, data):
-            _report_write_failure(plan.task_json_path)
-            print("Nothing was renamed.", file=sys.stderr)
-            return 1
-
-    for jsonl_path, _linenos, text in plan.jsonl:
-        try:
-            jsonl_path.write_text(text, encoding="utf-8")
-        except OSError as exc:
-            print(
-                colored(f"Error: Failed to write {jsonl_path}: {exc}", Colors.RED),
-                file=sys.stderr,
-            )
-            _rename_interrupted(plan)
-            return 1
-
-    for json_path, data, _labels in plan.backrefs:
-        if not write_json(json_path, data):
-            _report_write_failure(json_path)
-            _rename_interrupted(plan)
-            return 1
-
+    if plan.unreadable:
+        print("Error: unreadable task back-references; nothing renamed", file=sys.stderr)
+        return 1
+    data = dict(plan.task_data)
+    for field_name, _old_value, new_value in plan.identity:
+        data[field_name] = new_value
+    updates = {plan.task_dir: data}
+    updates.update({path.parent: value for path, value, _labels in plan.backrefs})
     try:
-        plan.task_dir.rename(plan.new_dir)
-    except OSError as exc:
-        print(
-            colored(f"Error: Failed to move {plan.old_rel} -> {plan.new_rel}: {exc}", Colors.RED),
-            file=sys.stderr,
-        )
-        _rename_interrupted(plan)
+        transaction = _plan(repo_root, [(plan.task_dir, plan.new_dir)], updates)
+        apply_plan(repo_root, transaction)
+    except (OSError, ValueError) as error:
+        print(f"Error: rename withheld: {error}", file=sys.stderr)
         return 1
-
-    # Last, and after the move: a session pointing at the old path would now
-    # resolve to a missing directory, so `current` would report the task stale
-    # and the context hook would inject nothing until the user ran `start`
-    # again. Rename moves the pointers because the task is still being worked on.
-    from .active_task import repoint_task_in_sessions
-
-    repoint_task_in_sessions(str(plan.task_dir), str(plan.new_dir), repo_root)
-
     return 0
 
 
@@ -1034,12 +1006,12 @@ def cmd_rename(args: argparse.Namespace) -> int:
             print(colored(f"Error: Task not found: {args.name}", Colors.RED), file=sys.stderr)
         return 1
 
-    # Restrict renames to task records directly under the tasks directory.
+    # Restrict renames to the prescribed status directory levels.
     if not is_within_tasks_dir(task_dir, repo_root):
         print(
             colored(
                 f"Error: refusing to rename '{args.name}': "
-                f"{task_dir} is not a task directly under {tasks_dir}",
+                f"{task_dir} is not a task in the status layout under {tasks_dir}",
                 Colors.RED,
             ),
             file=sys.stderr,
@@ -1062,7 +1034,8 @@ def cmd_rename(args: argparse.Namespace) -> int:
         return 1
 
     new_dir = task_dir.parent / new_name
-    if new_dir.exists():
+    from .task_layout import iter_task_dirs
+    if new_dir.exists() or any(directory.name == new_name for directory in iter_task_dirs(tasks_dir)):
         print(
             colored(f"Error: Task already exists: {new_name}", Colors.RED),
             file=sys.stderr,

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

@@ -16,6 +16,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 from .paths import get_repo_root, get_tasks_dir
+from .task_layout import iter_task_dirs, task_status_dir
 
 if TYPE_CHECKING:
     import subprocess
@@ -28,20 +29,14 @@ if TYPE_CHECKING:
 def is_within_tasks_dir(task_dir_abs: Path, repo_root: Path | None = None) -> bool:
     """Check that a resolved task directory really is a task under the tasks dir.
 
-    A real task lives directly at ``.trellis/tasks/<name>``. This returns True
-    only when ``task_dir_abs`` is an immediate child of the tasks directory.
-
-    The task must be a direct child of the tasks directory, not the directory
-    itself or a nested path.
+    A real task occupies one prescribed status directory, never nested content.
     """
     if repo_root is None:
         repo_root = get_repo_root()
     try:
-        resolved = task_dir_abs.resolve()
-        tasks_resolved = get_tasks_dir(repo_root).resolve()
+        return task_status_dir(task_dir_abs, get_tasks_dir(repo_root)) is not None
     except (OSError, RuntimeError):
         return False
-    return resolved.parent == tasks_resolved and resolved.name != "archive"
 
 
 # =============================================================================
@@ -74,22 +69,19 @@ def find_task_by_name(task_name: str, tasks_dir: Path) -> Path | None:
         print(f"Error: invalid task name: {task_name}", file=sys.stderr)
         return None
 
-    # Try exact match first
-    exact_match = tasks_dir / task_name
-    if exact_match.is_dir():
-        return exact_match
-
-    # Try suffix match (e.g., "my-task" matches "01-21-my-task")
-    matches = sorted(
-        d for d in tasks_dir.iterdir()
-        if d.is_dir() and d.name.endswith(f"-{task_name}")
-    )
+    try:
+        candidates = list(iter_task_dirs(tasks_dir))
+    except (ValueError, OSError) as error:
+        print(f"Error: {error}", file=sys.stderr)
+        return None
+    exact = [d for d in candidates if d.name == task_name]
+    matches = exact or [d for d in candidates if d.name.endswith(f"-{task_name}")]
     if len(matches) == 1:
         return matches[0]
     if matches:
         print(f"Error: ambiguous task name '{task_name}' matches:", file=sys.stderr)
         for match in matches:
-            print(f"  - {match.name}", file=sys.stderr)
+            print(f"  - {match.relative_to(tasks_dir)}", file=sys.stderr)
         print("Pass the full task directory name.", file=sys.stderr)
 
     return None
@@ -128,6 +120,14 @@ def resolve_task_dir(target_dir: str, repo_root: Path) -> Path | None:
         print("Error: task directory is required", file=sys.stderr)
         return None
 
+    from .task_move import require_settled_layout
+
+    try:
+        require_settled_layout(repo_root)
+    except ValueError as error:
+        print(f"Error: {error}", file=sys.stderr)
+        return None
+
     normalized = target_dir.replace("\\", "/")
     while normalized.startswith("./"):
         normalized = normalized[2:]
@@ -175,6 +175,10 @@ def resolve_task_dir(target_dir: str, repo_root: Path) -> Path | None:
         )
         return None
 
+    if not is_within_tasks_dir(candidate, repo_root):
+        print(f"Error: invalid task layout: {target_dir}; run task.py migrate-layout for old tasks", file=sys.stderr)
+        return None
+
     # Hand back the path spelled through the repo's own tasks dir rather than
     # `resolved`: `.trellis` may be a symlink into a store outside the repo
     # (#567), in which case `resolved` sits outside the repo even though the

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

@@ -61,11 +61,14 @@ def _task_dir(value: str) -> Path:
     return task_dir
 
 
-def _load(task_dir: Path) -> tuple[dict, dict]:
+def _load(task_dir: Path, *, initialize_meta: bool = False) -> tuple[dict, dict]:
     task_file = task_dir / FILE_TASK_JSON
     data, reason = read_json_checked(task_file)
     if data is None:
         raise TaskWorkflowError("TASK_PHASE_TASK_INVALID", f"cannot read {task_file}: {reason}")
+    # Explicit initialization may adopt legacy records; malformed metadata still fails.
+    if initialize_meta and "meta" not in data:
+        data["meta"] = {}
     meta = data.get("meta")
     if not isinstance(meta, dict):
         raise TaskWorkflowError("TASK_PHASE_TASK_INVALID", "task.meta must be an object")
@@ -177,7 +180,8 @@ def _save(task_file: Path, data: dict) -> None:
 
 @contextlib.contextmanager
 def _task_lock(task_dir: Path):
-    lock_file = task_dir / ".task-phase.lock"
+    lock_file = get_repo_root() / ".trellis/.runtime/task-phase" / f"{task_dir.name}.lock"
+    lock_file.parent.mkdir(parents=True, exist_ok=True)
     with lock_file.open("a+b") as handle:
         if os.name == "nt":
             import msvcrt
@@ -696,7 +700,7 @@ def cmd_phase(args: argparse.Namespace) -> int:
     try:
         task_dir = _task_dir(args.task_dir)
         with _task_lock(task_dir):
-            data, meta = _load(task_dir)
+            data, meta = _load(task_dir, initialize_meta=args.phase_action == "init")
             if args.phase_action == "init":
                 return _init(args, task_dir, data, meta)
             return _update(args, task_dir, data, _state(meta))
@@ -982,7 +986,8 @@ def cmd_cancel_task(args: argparse.Namespace) -> int:
             }
             data["status"] = "cancelled"
             data["completedAt"] = None
-            _save(task_dir / FILE_TASK_JSON, data)
+            from .task_move import relocate_task
+            task_dir = relocate_task(get_repo_root(), task_dir, data)
             from .active_task import clear_task_from_sessions
             from .task_continuity import clear_task_runtime_records
 
@@ -1069,26 +1074,28 @@ def _validate_child_dispositions(
 
 
 def _assert_delegated_resources_closed(task_dir: Path, data: dict) -> None:
-    repo_root = get_repo_root()
     children = data.get("children", [])
     if not isinstance(children, list):
         raise TaskWorkflowError("TASK_PHASE_RESOURCE_ACTIVE", "linked child task list is malformed")
     for task_id in [task_dir.name, *children]:
         _, child_meta = _load(_task_dir(task_id))
-        record = child_meta.get("delegated_worktree_execution_record")
-        if record is None:
-            continue
-        agent_id = record.get("agent_id") if isinstance(record, dict) else None
-        if not isinstance(agent_id, str) or not agent_id.strip():
-            raise TaskWorkflowError("TASK_PHASE_RESOURCE_ACTIVE", f"delegated execution status is unknown for {task_id}; preserve the current state")
-        agents = _paseo_list(
-            ["agent", "ls", "--all", "--global", "--background", "--json", "--label", f"trellis.task_id={task_id}"],
-            repo_root,
-            "TASK_PHASE_RESOURCE_ACTIVE",
-        )
-        agent = next((item for item in agents if item.get("id") == agent_id), None)
-        if agent is None or agent.get("status") != "closed":
-            raise TaskWorkflowError("TASK_PHASE_RESOURCE_ACTIVE", f"delegated Paseo agent for {task_id} is not confirmed closed; preserve the current state")
+        _assert_delegated_record_closed(task_id, child_meta.get("delegated_worktree_execution_record"))
+
+
+def _assert_delegated_record_closed(task_id: str, record) -> None:
+    if record is None:
+        return
+    agent_id = record.get("agent_id") if isinstance(record, dict) else None
+    if not isinstance(agent_id, str) or not agent_id.strip():
+        raise TaskWorkflowError("TASK_PHASE_RESOURCE_ACTIVE", f"delegated execution status is unknown for {task_id}; preserve the current state")
+    agents = _paseo_list(
+        ["agent", "ls", "--all", "--global", "--background", "--json", "--label", f"trellis.task_id={task_id}"],
+        get_repo_root(),
+        "TASK_PHASE_RESOURCE_ACTIVE",
+    )
+    agent = next((item for item in agents if item.get("id") == agent_id), None)
+    if agent is None or agent.get("status") != "closed":
+        raise TaskWorkflowError("TASK_PHASE_RESOURCE_ACTIVE", f"delegated Paseo agent for {task_id} is not confirmed closed; preserve the current state")
 
 
 def cmd_complete_task(args: argparse.Namespace) -> int:
@@ -1114,7 +1121,8 @@ def cmd_complete_task(args: argparse.Namespace) -> int:
                 raise TaskWorkflowError("TASK_PHASE_IMPLEMENTATION_NOT_STARTED", "implementation tasks must enter in_progress before complete")
             data["status"] = "completed"
             data["completedAt"] = datetime.now().strftime("%Y-%m-%d")
-            _save(task_dir / FILE_TASK_JSON, data)
+            from .task_move import relocate_task
+            task_dir = relocate_task(get_repo_root(), task_dir, data)
             from .active_task import clear_task_from_sessions
             from .task_continuity import clear_task_runtime_records