@pennixrv/trellis 0.7.1-beta.11 → 0.7.1-beta.13

package/dist/templates/shared-hooks/session-start.py

@@ -429,8 +429,7 @@ def _get_task_status(trellis_dir: Path, input_data: dict) -> str:
         return (
             "Status: NO ACTIVE TASK\n"
             "Next-Action: Classify the current turn before creating any Trellis task. "
-            "Simple conversation / small task asks only whether this turn should create a Trellis task. "
-            "Complex task asks whether task creation and planning are allowed."
+            "Route through trellis-request-intake using the existing authorization and taskless contract."
         )
 
     task_ref = active.task_path
@@ -443,12 +442,10 @@ def _get_task_status(trellis_dir: Path, input_data: dict) -> str:
         )
 
     task_json_path = task_dir / "task.json"
-    task_data = {}
-    if task_json_path.is_file():
-        try:
-            task_data = json.loads(task_json_path.read_text(encoding="utf-8"))
-        except (json.JSONDecodeError, PermissionError):
-            pass  # Optional task metadata; fall back to generic status.
+    from common.io import read_json_checked  # type: ignore[import-not-found]
+    task_data, _reason = read_json_checked(task_json_path)
+    if task_data is None or task_data.get("status") not in ("planning", "in_progress", "completed", "cancelled"):
+        return f"Status: TASK_ERROR\nTask: {task_ref}\nNext-Action: Repair the existing task record through its owner before continuing; do not create a replacement task."
 
     task_title = task_data.get("title", task_ref)
     task_status = task_data.get("status", "unknown")
@@ -698,13 +695,15 @@ def _build_compact_current_state(
     active = _resolve_active_task(trellis_dir, input_data)
     if active.task_path:
         task_dir = _resolve_task_dir(trellis_dir, active.task_path)
-        status = "unknown"
+        status = "task_error"
         task_json = task_dir / "task.json"
         if task_json.is_file():
             try:
                 data = json.loads(task_json.read_text(encoding="utf-8"))
                 if isinstance(data, dict):
-                    status = str(data.get("status") or "unknown")
+                    value = data.get("status")
+                    if value in ("planning", "in_progress", "completed", "cancelled"):
+                        status = value
             except (json.JSONDecodeError, OSError):
                 pass  # Optional task metadata; fall back to generic status.
         lines.append(f"Current task: {_repo_relative(repo_root, task_dir)}; status={status}.")
@@ -859,7 +858,12 @@ def main():
             project_dir = Path(_normalize_windows_shell_path(val)).resolve()
             break
     if project_dir is None:
-        project_dir = Path(_normalize_windows_shell_path(hook_input.get("cwd", "."))).resolve()
+        raw_cwd = hook_input.get("cwd")
+        project_dir = Path(_normalize_windows_shell_path(raw_cwd if isinstance(raw_cwd, str) and raw_cwd else ".")).resolve()
+
+    project_dir = next((candidate for candidate in (project_dir, *project_dir.parents) if (candidate / ".trellis").is_dir()), None)
+    if project_dir is None or not (project_dir / ".trellis" / "scripts" / "common" / "active_task.py").is_file():
+        return
 
     trellis_dir = project_dir / ".trellis"
     context_key = _resolve_context_key(trellis_dir, hook_input)

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

@@ -313,6 +313,10 @@ def transfer_task_ownership(args: argparse.Namespace) -> int:
     root = get_repo_root()
     operation = args.transfer_action
     try:
+        package_bound = args.package_id is not None or args.package_digest is not None
+        if operation != "status" or package_bound:
+            if not isinstance(args.package_id, str) or not PACKAGE_ID_RE.fullmatch(args.package_id) or not isinstance(args.package_digest, str) or not PACKAGE_DIGEST_RE.fullmatch(args.package_digest):
+                raise ContinuityError("TASK_TRANSFER_INVALID_INPUT", "session package identity and SHA-256 digest are required")
         task_dir = resolve_task_dir(args.task_path, root)
         if task_dir is None or not is_within_tasks_dir(task_dir, root):
             raise ContinuityError("TASK_TRANSFER_WITHHELD", "task path is unavailable or unsafe")
@@ -328,8 +332,10 @@ def transfer_task_ownership(args: argparse.Namespace) -> int:
         path = _ownership_path(root, task_path)
         with _record_lock(path):
             record = _load_owner(path)
+            if record and (record["task_id"] != task_id or record["task_path"] != task_path):
+                raise ContinuityError("TASK_TRANSFER_WITHHELD", "ownership record does not match the requested task")
             if operation == "status":
-                if record and (record["package_id"] != args.package_id or record["package_digest"] != args.package_digest):
+                if record and package_bound and (record["package_id"] != args.package_id or record["package_digest"] != args.package_digest):
                     raise ContinuityError("TASK_TRANSFER_STALE_PACKAGE", "session package identity or digest changed")
                 result = record or {"status": "absent", "generation": 0, "task_id": task_id}
                 if args.include_current:
@@ -342,8 +348,6 @@ def transfer_task_ownership(args: argparse.Namespace) -> int:
             if args.expected_generation is None or args.expected_generation < 0:
                 raise ContinuityError("TASK_TRANSFER_INVALID_INPUT", "a non-negative expected generation is required")
             if operation == "quiesce":
-                if not PACKAGE_ID_RE.fullmatch(args.package_id) or not PACKAGE_DIGEST_RE.fullmatch(args.package_digest):
-                    raise ContinuityError("TASK_TRANSFER_INVALID_INPUT", "session package identity or SHA-256 digest is invalid")
                 context_key, current_path = _direct_pointer(root, task_path)
                 if current_path is None:
                     raise ContinuityError("TASK_TRANSFER_WITHHELD", "source session has no current task")
@@ -360,13 +364,18 @@ def transfer_task_ownership(args: argparse.Namespace) -> int:
                         result = record
                         print(json.dumps(result, ensure_ascii=False, sort_keys=True))
                         return 0
-                    raise ContinuityError("TASK_TRANSFER_STALE_GENERATION", "task already has an ownership record")
-                if args.expected_generation != 0:
+                    if record["status"] != "consumed" or record["generation"] != args.expected_generation:
+                        raise ContinuityError("TASK_TRANSFER_STALE_GENERATION", "task already has an ownership record at a different state or generation")
+                    if record["target_session_id"] != context_key:
+                        raise ContinuityError("TASK_TRANSFER_WITHHELD", "only the consumed target can start another handoff")
+                    if record["package_id"] == args.package_id:
+                        raise ContinuityError("TASK_TRANSFER_STALE_PACKAGE", "another handoff requires a new session package")
+                elif args.expected_generation != 0:
                     raise ContinuityError("TASK_TRANSFER_STALE_GENERATION", "initial ownership generation must be 0")
                 record = {
                     "schema_version": 1, "task_id": task_id, "task_path": task_path,
                     "package_id": args.package_id, "package_digest": args.package_digest,
-                    "generation": 1, "status": "quiescing", "source_session_id": context_key,
+                    "generation": args.expected_generation + 1, "status": "quiescing", "source_session_id": context_key,
                     "target_session_id": None, "continuity_digest": continuity_digest,
                     "route": _route_snapshot(data),
                 }
@@ -491,8 +500,8 @@ def add_continuity_commands(subparsers) -> None:
     transfer.add_argument("transfer_action", choices=("status", "quiesce", "seal", "retire", "claim", "consume", "release"))
     transfer.add_argument("--task-id", required=True)
     transfer.add_argument("--task-path", required=True)
-    transfer.add_argument("--package-id", required=True)
-    transfer.add_argument("--package-digest", required=True)
+    transfer.add_argument("--package-id", help="Required with --package-digest for mutations or package-bound status")
+    transfer.add_argument("--package-digest", help="Required with --package-id for mutations or package-bound status")
     transfer.add_argument("--expected-continuity-digest", help="Expected live projection for sealed-source claim recovery")
     transfer.add_argument("--expected-generation", type=int)
     transfer.add_argument("--include-current", action="store_true", help="Include the live task projection and its digest in transfer status")

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

@@ -133,6 +133,10 @@ def implementation_start_ready(data: dict, task_dir: Path) -> bool:
     phase_ids = state.get("phase_ids")
     if not isinstance(phase_ids, list) or PHASE_IDS[3] not in phase_ids:
         return False
+    phases = state.get("phases")
+    implementation = phases.get(PHASE_IDS[3]) if isinstance(phases, dict) else None
+    if not isinstance(implementation, dict) or implementation.get("status") != "active":
+        return False
     if state.get("task_kind") not in {"implementation", "combined"}:
         return False
     authorization = state.get("implementation_authorization")
@@ -460,11 +464,12 @@ def _update(args: argparse.Namespace, task_dir: Path, data: dict, state: dict) -
         current, record = PHASE_IDS[4], state["phases"][PHASE_IDS[4]]
     else:
         current, record = _phase(state)
+    accepted_design_return = action == "return" and current == PHASE_IDS[2] and record.get("status") == "accepted"
     returning_to_requirements = action == "return" and args.target_phase == PHASE_IDS[0]
     rerouting_to_requirements = action == "route" and args.target_phase == PHASE_IDS[0]
     if current != PHASE_IDS[0] and not returning_to_requirements and not rerouting_to_requirements:
         _require_current_requirements_confirmation(task_dir, state)
-    if action not in {"show", "resume", "route", "authorize", "admission"} and record.get("status") != "active" and not reviewed_delivery:
+    if action not in {"show", "resume", "route", "authorize", "admission"} and record.get("status") != "active" and not reviewed_delivery and not accepted_design_return:
         raise TaskWorkflowError("TASK_PHASE_INVALID_TRANSITION", "only the active phase can be changed")
 
     if action == "artifact":
@@ -565,7 +570,7 @@ def _update(args: argparse.Namespace, task_dir: Path, data: dict, state: dict) -
         target = _required_text(args.target_phase, "--target-phase")
         if target not in state["phase_ids"] or (
             state["phase_ids"].index(target) >= state["phase_ids"].index(current)
-            and not (reviewed_delivery and target == current)
+            and not ((reviewed_delivery or accepted_design_return) and target == current)
         ):
             raise TaskWorkflowError("TASK_PHASE_INVALID_TRANSITION", "return target must be an earlier phase in the current route")
         reason = _required_text(args.reason, "--reason")
@@ -760,6 +765,11 @@ def cmd_delegate_start(args: argparse.Namespace) -> int:
             child_data, child_meta = _load(child_dir)
             if child_data.get("parent") != parent_dir.name or child_dir.name not in parent_data.get("children", []):
                 raise TaskWorkflowError("TASK_DELEGATE_PARENT_LINK_INVALID", "parent and child task links do not match")
+            from .task_continuity import assert_task_mutation_allowed
+
+            assert_task_mutation_allowed(repo_root, parent_dir, parent_data)
+            if child_data.get("status") not in {"planning", "in_progress"}:
+                raise TaskWorkflowError("TASK_DELEGATE_CHILD_TERMINAL", "only a planning or in-progress child task can be delegated")
             if parent_data.get("status") != "in_progress" or not implementation_start_ready(parent_data, parent_dir):
                 raise TaskWorkflowError("TASK_DELEGATE_IMPLEMENTATION_NOT_AUTHORIZED", "parent task is not at an authorized Task Implementation and Test Verification Phase entry")
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pennixrv/trellis",
-  "version": "0.7.1-beta.11",
+  "version": "0.7.1-beta.13",
   "description": "AI capabilities grow like ivy — Trellis provides the structure to guide them along a disciplined path",
   "type": "module",
   "main": "./dist/index.js",
@@ -34,7 +34,7 @@
     "inquirer": "^9.3.7",
     "undici": "^6.21.0",
     "zod": "^4.4.2",
-    "@pennixrv/trellis-core": "0.7.1-beta.11"
+    "@pennixrv/trellis-core": "0.7.1-beta.13"
   },
   "devDependencies": {
     "@eslint/js": "^9.18.0",