@pennixrv/trellis 0.7.1-beta.10 → 0.7.1-beta.12

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),
                 }
@@ -385,17 +394,13 @@ def transfer_task_ownership(args: argparse.Namespace) -> int:
                     if not PACKAGE_DIGEST_RE.fullmatch(args.expected_continuity_digest):
                         raise ContinuityError("TASK_TRANSFER_INVALID_INPUT", "expected continuity digest must be a SHA-256 digest")
                     if args.expected_continuity_digest != current_digest:
-                        raise ContinuityError("TASK_TRANSFER_STALE_CONTINUITY", "current task projection differs from the explicitly reconciled snapshot")
+                        raise ContinuityError("TASK_TRANSFER_STALE_CONTINUITY", "current task projection differs from the explicitly checked snapshot")
                 # Recovery acknowledges a live target snapshot without rebasing the source package.
-                reconciled_claim = (
+                recovered_claim = (
                     operation == "claim" and record["status"] == "sealed"
                     and args.expected_continuity_digest == current_digest
                 )
-                reconciled_target = (
-                    operation == "reconcile" and record["status"] == "consumed"
-                    and args.expected_continuity_digest == current_digest
-                )
-                if operation != "release" and current_digest != record.get("target_continuity_digest", record["continuity_digest"]) and not (reconciled_claim or reconciled_target):
+                if operation != "release" and current_digest != record.get("target_continuity_digest", record["continuity_digest"]) and not recovered_claim:
                     raise ContinuityError("TASK_TRANSFER_STALE_CONTINUITY", "task continuity changed during ownership transfer")
                 if operation != "release" and _route_snapshot(data) != record["route"]:
                     raise ContinuityError("TASK_TRANSFER_STALE_ROUTE", "task phase, route, input, or implementation authorization changed")
@@ -403,13 +408,10 @@ def transfer_task_ownership(args: argparse.Namespace) -> int:
                 if operation in {"seal", "retire"}:
                     if context_key != record["source_session_id"] or current_path not in {record["task_path"], None}:
                         raise ContinuityError("TASK_TRANSFER_WITHHELD", "source session no longer owns the current task")
-                elif operation in {"claim", "consume", "reconcile"}:
+                elif operation in {"claim", "consume"}:
                     if context_key == record["source_session_id"]:
                         raise ContinuityError("TASK_TRANSFER_WITHHELD", "target must be a different direct session")
-                if operation == "reconcile":
-                    if not reconciled_target or context_key != record["target_session_id"] or current_path != record["task_path"]:
-                        raise ContinuityError("TASK_TRANSFER_WITHHELD", "only the consumed target may reconcile its explicitly pinned projection")
-                elif operation == "release":
+                if operation == "release":
                     if record["status"] not in {"quiescing", "sealed", "recovery_required"} or record["target_session_id"] is not None:
                         raise ContinuityError("TASK_TRANSFER_INVALID_TRANSITION", "ownership can be released only before target claim")
                     if context_key != record["source_session_id"] or current_path not in {None, record["task_path"]}:
@@ -422,9 +424,7 @@ def transfer_task_ownership(args: argparse.Namespace) -> int:
                     path.unlink(missing_ok=True)
                     print(json.dumps({"status": "released", "generation": record["generation"], "task_id": task_id}, ensure_ascii=False, sort_keys=True))
                     return 0
-                if operation == "reconcile":
-                    record.update({"target_continuity_digest": current_digest, "generation": record["generation"] + 1})
-                elif operation == "seal" and record["status"] == "quiescing":
+                if operation == "seal" and record["status"] == "quiescing":
                     record.update({"status": "sealed", "generation": record["generation"] + 1})
                 elif operation == "retire" and record["status"] in {"sealed", "retiring", "recovery_required"}:
                     if record["status"] == "sealed":
@@ -440,14 +440,14 @@ def transfer_task_ownership(args: argparse.Namespace) -> int:
                         write_json(path, record)
                         raise ContinuityError("TASK_TRANSFER_RECOVERY_REQUIRED", "source pointer remains after retirement")
                     record["status"] = "ready"
-                elif operation == "claim" and (record["status"] in {"ready", "claiming", "recovery_required", "claimed"} or reconciled_claim):
+                elif operation == "claim" and (record["status"] in {"ready", "claiming", "recovery_required", "claimed"} or recovered_claim):
                     if record["status"] in {"claiming", "recovery_required"} and record["target_session_id"] != context_key:
                         raise ContinuityError("TASK_TRANSFER_WITHHELD", "only the recorded target session can recover a claim")
                     if current_path not in {None, record["task_path"]}:
                         raise ContinuityError("TASK_TRANSFER_WITHHELD", "target session already has a current task")
                     if record["status"] in {"ready", "sealed"}:
                         record.update({"status": "claiming", "generation": record["generation"] + 1, "target_session_id": context_key})
-                        if reconciled_claim:
+                        if recovered_claim:
                             record["target_continuity_digest"] = current_digest
                         if not write_json(path, record):
                             raise ContinuityError("TASK_TRANSFER_WRITE_FAILED", "could not record target claim")
@@ -497,12 +497,12 @@ def add_continuity_commands(subparsers) -> None:
     capture.add_argument("--expected-source-digest", required=True, help="Current captured digest, or absent")
 
     transfer = subparsers.add_parser("transfer", help="Transfer task ownership between direct sessions")
-    transfer.add_argument("transfer_action", choices=("status", "quiesce", "seal", "retire", "claim", "consume", "release", "reconcile"))
+    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("--expected-continuity-digest", help="Expected live projection; required for sealed-source claim or consumed-target reconciliation")
+    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")
     transfer.add_argument("--explicit-user-request", action="store_true")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pennixrv/trellis",
-  "version": "0.7.1-beta.10",
+  "version": "0.7.1-beta.12",
   "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.10"
+    "@pennixrv/trellis-core": "0.7.1-beta.12"
   },
   "devDependencies": {
     "@eslint/js": "^9.18.0",