@pennixrv/trellis 0.7.1 → 0.7.2-beta.2

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

@@ -19,6 +19,7 @@ from pathlib import Path
 from .io import describe_json_read_failure, read_json_checked
 from .paths import FILE_TASK_JSON
 from .types import TaskInfo
+from .task_layout import iter_task_dirs, task_status_dir
 
 
 def load_task(task_dir: Path) -> TaskInfo | None:
@@ -72,14 +73,14 @@ def iter_active_tasks(tasks_dir: Path) -> Iterator[TaskInfo]:
     Yields:
         TaskInfo for each valid task.
     """
-    if not tasks_dir.is_dir():
-        return
+    from .task_move import require_settled_layout
 
-    for d in sorted(tasks_dir.iterdir()):
-        if not d.is_dir():
-            continue
+    require_settled_layout(tasks_dir.parent.parent)
+    for d in iter_task_dirs(tasks_dir):
         info = load_task(d)
         if info is not None:
+            if info.status != task_status_dir(d, tasks_dir):
+                print(f"[WARN] Task status/directory mismatch: {d}", file=sys.stderr)
             yield info
 
 

package/dist/templates/trellis/scripts/hooks/linear_sync.py

@@ -9,7 +9,7 @@ Usage (called automatically by task.py hooks):
     python3 .trellis/scripts/hooks/linear_sync.py complete
 
 Manual usage:
-    TASK_JSON_PATH=.trellis/tasks/<name>/task.json python3 .trellis/scripts/hooks/linear_sync.py sync
+    TASK_JSON_PATH=.trellis/tasks/<task-dir>/task.json python3 .trellis/scripts/hooks/linear_sync.py sync
 
 Environment:
     TASK_JSON_PATH  - Absolute path to task.json (set by task.py)
@@ -211,8 +211,18 @@ def _resolve_parent_linear_issue(task: dict) -> str | None:
         return None
 
     current_task_dir = Path(task_json_path).parent
-    tasks_dir = current_task_dir.parent
-    parent_json = tasks_dir / parent_name / "task.json"
+    scripts_dir = Path(__file__).resolve().parents[1]
+    if str(scripts_dir) not in sys.path:
+        sys.path.insert(0, str(scripts_dir))
+    from common.paths import get_tasks_dir
+    from common.task_utils import find_task_by_name
+    workflow_dir = next((parent for parent in current_task_dir.parents if parent.name == ".trellis"), None)
+    if workflow_dir is None:
+        return None
+    parent_dir = find_task_by_name(parent_name, get_tasks_dir(workflow_dir.parent))
+    if parent_dir is None:
+        return None
+    parent_json = parent_dir / "task.json"
 
     if parent_json.exists():
         try:

package/dist/templates/trellis/scripts/task.py

@@ -14,6 +14,7 @@ Usage:
     python3 task.py workflow <id>|--clear       # Set/clear per-task workflow selection
     python3 task.py phase <action> <task-dir>    # Read/update task phase workflow state
     python3 task.py cancel <task-dir> --reason <text> --evidence-ref <ref>  # Cancel task lifecycle
+    python3 task.py reopen <task-dir> --reason <text> --evidence-ref <ref>  # Restore terminal task to planning
     python3 task.py set-branch <dir> <branch>   # Set git branch
     python3 task.py set-base-branch <dir> <branch>  # Set PR target branch
     python3 task.py set-scope <dir> <scope>     # Set scope for PR title
@@ -79,8 +80,11 @@ from common.task_context import (
 from common.task_workflow import (
     TaskWorkflowError,
     cmd_cancel_task,
+    cmd_reopen_task,
     cmd_complete_task,
     cmd_delegate_start,
+    cmd_delegate_bind,
+    cmd_delegate_reconcile,
     cmd_phase,
     implementation_start_ready,
 )
@@ -101,7 +105,7 @@ def _record_start_state(
     task_json_path: Path,
     repo_root: Path,
     label: str = "",
-) -> None:
+) -> Path:
     """Enter implementation and record its branch after current authorization.
 
     Planning and analysis tasks keep their lifecycle status while the active
@@ -121,7 +125,7 @@ def _record_start_state(
             file=sys.stderr,
         )
         print(hint, file=sys.stderr)
-        return
+        return task_json_path
 
     applied: list[str] = []
 
@@ -132,7 +136,7 @@ def _record_start_state(
             colored(f"Warning: Implementation start withheld; task.json not updated: {error.code}: {error}", Colors.YELLOW),
             file=sys.stderr,
         )
-        return
+        return task_json_path
     if data.get("status") == "planning" and implementation_ready:
         data["status"] = "in_progress"
         applied.append(f"✓ Status: planning → in_progress{label}")
@@ -158,15 +162,18 @@ def _record_start_state(
             )
 
     if not applied:
-        return
+        return task_json_path
 
     try:
         assert_task_mutation_allowed(repo_root, task_json_path.parent, data)
     except TaskWorkflowError as error:
         print(colored(f"{error.code}: task metadata update withheld: {error}", Colors.YELLOW), file=sys.stderr)
-        return
+        return task_json_path
 
-    if not write_json(task_json_path, data):
+    from common.task_move import relocate_task
+    relocated = relocate_task(repo_root, task_json_path.parent, data)
+    task_json_path = relocated / FILE_TASK_JSON
+    if not task_json_path.is_file():
         print(
             colored(
                 f"Warning: Failed to write {task_json_path}; "
@@ -175,7 +182,7 @@ def _record_start_state(
             ),
             file=sys.stderr,
         )
-        return
+        return task_json_path
 
     for line in applied:
         print(colored(line, Colors.GREEN))
@@ -190,12 +197,15 @@ def _record_start_state(
             ),
             file=sys.stderr,
         )
+
         print(
             f"Once you branch off, run: python3 {DIR_WORKFLOW}/scripts/task.py "
             "set-branch <task> <feature-branch>",
             file=sys.stderr,
         )
 
+    return task_json_path
+
 
 def cmd_start(args: argparse.Namespace) -> int:
     """Set active task."""
@@ -237,6 +247,11 @@ def cmd_start(args: argparse.Namespace) -> int:
         return 1
 
     task_json_path = full_path / FILE_TASK_JSON
+    if task_json_path.is_file():
+        task_data, _ = read_json_checked(task_json_path)
+        if task_data is not None and task_data.get("status") in {"completed", "cancelled"}:
+            print(colored(f"TASK_PHASE_TASK_TERMINAL: task is already {task_data['status']}", Colors.RED), file=sys.stderr)
+            return 1
 
     if not resolve_context_key():
         # Degraded mode: no session identity available.
@@ -256,18 +271,17 @@ def cmd_start(args: argparse.Namespace) -> int:
 
         # Enter implementation only when the accepted phase contract authorizes it.
         if task_json_path.is_file():
-            _record_start_state(task_json_path, repo_root, " (degraded)")
+            task_json_path = _record_start_state(task_json_path, repo_root, " (degraded)")
             run_task_hooks("after_start", task_json_path, repo_root)
         return 0
 
+    if task_json_path.is_file():
+        task_json_path = _record_start_state(task_json_path, repo_root)
+        task_dir = task_json_path.parent.relative_to(repo_root).as_posix()
     active = set_active_task(task_dir, repo_root)
     if active:
-        print(colored(f"✓ Current task set to: {task_dir}", Colors.GREEN))
+        print(colored(f"✓ Current task set to: {task_json_path.parent.relative_to(repo_root).as_posix()}", Colors.GREEN))
         print(f"Source: {active.source}")
-
-        if task_json_path.is_file():
-            _record_start_state(task_json_path, repo_root)
-
         print()
         print(colored("The hook will now inject context from this task's jsonl files.", Colors.BLUE))
 
@@ -348,6 +362,11 @@ def cmd_current(args: argparse.Namespace) -> int:
         payload = {
             "current_task": task_obj,
             "source": active.source,
+            "session_source": (
+                f"session:{active.context_key}"
+                if active.context_key
+                else None
+            ),
             "stale": active.stale,
         }
         # Only present when the read failed, so the healthy shape is unchanged.
@@ -494,7 +513,7 @@ def cmd_list(args: argparse.Namespace) -> int:
             if filter_status and t.status != filter_status:
                 continue
             items.append({
-                "dir": f"{DIR_WORKFLOW}/{DIR_TASKS}/{dir_name}",
+                "dir": t.directory.relative_to(repo_root).as_posix(),
                 "id": t.raw.get("id") or dir_name,
                 "title": t.title,
                 "status": t.status,
@@ -533,7 +552,7 @@ def cmd_list(args: argparse.Namespace) -> int:
         if filter_status and t.status != filter_status:
             return
 
-        relative_path = f"{DIR_WORKFLOW}/{DIR_TASKS}/{dir_name}"
+        relative_path = t.directory.relative_to(repo_root).as_posix()
         marker = ""
         if relative_path == current_task:
             marker = f" {colored('<- current', Colors.GREEN)}"
@@ -617,7 +636,7 @@ Rename options:
 
 List options:
   --mine, -m           Show only tasks assigned to current developer
-  --status, -s <s>     Filter by status (planning, in_progress, review, completed)
+  --status, -s <s>     Filter by status (planning, in_progress, completed, cancelled)
   --json               Output machine-readable JSON (also available on `current`)
 
 Examples:
@@ -769,6 +788,7 @@ def main() -> int:
     p_phase.add_argument("--route-reason", help="Reason when initialization omits one or more phases")
     p_phase.add_argument("--route-evidence-ref", action="append", help="Evidence supporting an abbreviated initial route")
     p_phase.add_argument("--target-phase", help="Earlier phase to revisit, or first affected phase for route change")
+    p_phase.add_argument("--return-kind", choices=("contract_change", "execution_rework", "withdrawal"), default="contract_change", help="Classify a return or explicitly record user withdrawal")
     p_phase.add_argument("--artifact-ref", action="append", help="Task-relative file in the current phase output")
     p_phase.add_argument("--artifact-revision", help="Current artifact_revision required for acceptance")
     p_phase.add_argument("--result-ref", help="Task result artifact reference")
@@ -784,6 +804,14 @@ def main() -> int:
 
     p_delegate = subparsers.add_parser("delegate-start", help="Start an authorized child task in a Paseo worktree")
     p_delegate.add_argument("child_task", help="Linked child task directory or name")
+    p_delegate_bind = subparsers.add_parser("delegate-bind", help="Freeze a linked child contract within current parent authorization")
+    p_delegate_bind.add_argument("child_task")
+    p_delegate_bind.add_argument("--result-path", help="Assigned artifact under .trellis/delegated-results/")
+    p_delegate_reconcile = subparsers.add_parser("delegate-reconcile", help="Inspect or explicitly retire a verified delegated execution")
+    p_delegate_reconcile.add_argument("child_task")
+    p_delegate_reconcile.add_argument("--execute", action="store_true")
+    p_delegate_reconcile.add_argument("--reason")
+    p_delegate_reconcile.add_argument("--approval-ref")
 
     add_continuity_commands(subparsers)
 
@@ -793,6 +821,11 @@ def main() -> int:
     p_cancel.add_argument("--reason", required=True, help="Why the task is cancelled")
     p_cancel.add_argument("--evidence-ref", action="append", required=True, help="Task-relative cancellation evidence")
 
+    p_reopen = subparsers.add_parser("reopen", help="Recover a terminal task to planning without implementation authorization")
+    p_reopen.add_argument("task_dir", help="Task directory or task name")
+    p_reopen.add_argument("--reason", required=True, help="Why the same task must continue")
+    p_reopen.add_argument("--evidence-ref", action="append", required=True, help="Recovery decision evidence")
+
     # set-branch
     p_branch = subparsers.add_parser("set-branch", help="Set git branch")
     p_branch.add_argument("dir", help="Task directory")
@@ -844,16 +877,18 @@ def main() -> int:
     p_complete = subparsers.add_parser("complete", help="Complete after Delivery Review and On-Site Closeout Phase acceptance")
     p_complete.add_argument("task_dir", help="Task directory or task name")
 
+    p_migrate = subparsers.add_parser("migrate-layout", help="Preview or explicitly apply task status directory migration")
+    migration_mode = p_migrate.add_mutually_exclusive_group()
+    migration_mode.add_argument("--apply", action="store_true", help="Recheck and apply the migration")
+    migration_mode.add_argument("--recover", action="store_true", help="Roll back an interrupted relocation")
+
     args = parser.parse_args()
 
     if not args.command:
         show_usage()
         return 1
 
-    if args.command == "continuity":
-        return continuity_show(args) if args.continuity_action == "show" else continuity_capture(args)
-    if args.command == "transfer":
-        return transfer_task_ownership(args)
+    from common.task_move import cmd_migrate_layout, layout_lock, require_settled_layout
 
     commands = {
         "create": cmd_create,
@@ -866,8 +901,11 @@ def main() -> int:
         "workflow": cmd_workflow,
         "phase": cmd_phase,
         "delegate-start": cmd_delegate_start,
+        "delegate-bind": cmd_delegate_bind,
+        "delegate-reconcile": cmd_delegate_reconcile,
         "complete": cmd_complete_task,
         "cancel": cmd_cancel_task,
+        "reopen": cmd_reopen_task,
         "set-branch": cmd_set_branch,
         "set-base-branch": cmd_set_base_branch,
         "set-scope": cmd_set_scope,
@@ -876,12 +914,26 @@ def main() -> int:
         "add-subtask": cmd_add_subtask,
         "remove-subtask": cmd_remove_subtask,
         "list": cmd_list,
+        "migrate-layout": cmd_migrate_layout,
     }
 
-    if args.command in commands:
-        return commands[args.command](args)
-    else:
-        show_usage()
+    try:
+        with layout_lock(get_repo_root()):
+            if args.command != "migrate-layout":
+                require_settled_layout(get_repo_root())
+            if args.command == "continuity":
+                return continuity_show(args) if args.continuity_action == "show" else continuity_capture(args)
+            if args.command == "transfer":
+                return transfer_task_ownership(args)
+            if args.command in commands:
+                return commands[args.command](args)
+            show_usage()
+            return 1
+    except TaskWorkflowError as error:
+        print(f"{error.code}: {error}", file=sys.stderr)
+        return 1
+    except (ValueError, OSError) as error:
+        print(f"TASK_LAYOUT_WITHHELD: {error}", file=sys.stderr)
         return 1
 
 

package/dist/templates/trellis/teamwork.json

@@ -0,0 +1,10 @@
+{
+  "schema_version": 2,
+  "default_mode": "general",
+  "modes": {
+    "general": { "default_members": 1, "max_concurrency": 8 },
+    "advisor": { "default_members": 3, "max_concurrency": 3 },
+    "committee": { "default_members": 3, "max_concurrency": 3 }
+  },
+  "resources": { "max_live_teammates": 8, "non_batch_reserved": 0 }
+}

package/dist/templates/trellis/workflow.md

@@ -20,7 +20,7 @@ python3 ./.trellis/scripts/get_context.py --mode spec --file <path>
 
 ### 任务记录
 
-Trellis task 位于 `.trellis/tasks/`，包含 `task.json`、需求以及任务所需的设计、实施、研究或上下文资产。使用 Trellis CLI 创建和启动任务、初始化和推进阶段路线，以及完成或取消任务。不得手工修改任务状态或阶段状态。
+Trellis task 按 `task.json.status` 存放在 `.trellis/tasks/planning/<task>`、`in_progress/<task>`、`completed/YYYY-MM/<task>` 或 `cancelled/<task>`。创建进入 `planning`，获准实施后启动进入 `in_progress`；目录仅是状态的投影。每个任务包含 `task.json`、需求以及任务所需的设计、实施、研究或上下文资产。使用 Trellis CLI 创建和启动任务、初始化和推进阶段路线，以及完成或取消任务。不得手工修改任务状态或阶段状态。
 
 ```bash
 python3 ./.trellis/scripts/task.py create "<title>" [--slug <name>] [--parent <task>]
@@ -30,11 +30,20 @@ python3 ./.trellis/scripts/task.py validate <task>
 python3 ./.trellis/scripts/task.py start <task>
 python3 ./.trellis/scripts/task.py complete <task>
 python3 ./.trellis/scripts/task.py cancel <task> --reason "<reason>" --evidence-ref <reference>
+python3 ./.trellis/scripts/task.py reopen <task> --reason "<reason>" --evidence-ref <reference>
 ```
 
 使用 `phase artifact`、`accept`、`skip`、`wait`、`block`、`resume`、`return`、`route` 和 `authorize` 执行对应的阶段操作。准确参数以 `task.py --help` 为准。跳过阶段必须提供理由和证据；目标探索与需求核对阶段不可省略。
 
-只有阶段路线已到达获准的实施入口时，`task.py start` 才会将任务从 `planning` 改为 `in_progress`。分析任务可在交付审查与现场收尾阶段后仍处于 `planning` 时完成。`complete` 和 `cancel` 会清除任务的运行时会话指针；任务记录保留在原位置。
+只有阶段路线已到达获准的实施入口时，`task.py start` 才会将任务从 `planning` 改为 `in_progress`。分析任务可在交付审查与现场收尾阶段后仍处于 `planning` 时完成。`complete` 将任务移入 `completed/YYYY-MM/<task>`，`cancel` 将任务移入 `cancelled/<task>`，并在同一事务中清除任务的运行时会话指针。
+
+工作流阶段回流与原生任务生命周期恢复分别操作。`completed` 或 `cancelled` 任务需要在原线程继续时，先用 `reopen` 恢复到 `planning`，保留终态事实、取消原因和恢复证据，清除旧运行态、实施授权和依赖准入；工作流阶段保持原记录。随后用 `phase return` 回到最早受影响阶段。实现任务重新接受合同、取得新的实施授权并核验准入后，才由 `start` 进入 `in_progress`。`phase return` 不能直接修改终态任务。
+
+`phase return` 默认采用 `contract_change`，使受影响阶段接受和实施授权失效。合同不变的局部实施或证据返工可显式使用 `--return-kind execution_rework`，目标限于实施或交付阶段，可重入当前阶段；CLI 核验需求、已接受合同、授权摘要、路线 revision 和已声明依赖准入仍有效后，保留授权，清理目标阶段及下游的接受事实。不能以此修改目标、合同或绕过待决依赖。普通局部修复可直接在当前活动阶段完成，无需为了记录进展而回流。
+
+新接受的 `implementation_contract`（以及省略设计阶段时新授权的合同）必须包含 `## 验收覆盖` 表，表头固定为 `接受条件 | 工作包 | Owner | 验证入口 | 交付证据 | 停止条件`，至少一行且各单元格非空。CLI 负责结构检查，阶段 Skill 负责逐条核对已接受条件的语义覆盖。既有接受和授权不会因本次升级自动失效；再次接受或授权时执行新检查。
+
+旧布局须先预览 `task.py migrate-layout`，核对后执行 `task.py migrate-layout --apply`；旧 `archive/YYYY-MM` 中已完成的任务保留原月份，其他任务按真实状态放置。迁移会同步 JSON/JSONL 机器引用、会话指针和运行态索引，保留任务身份与父子关系，不重授历史授权。未完成事务会阻止普通任务命令，须用 `task.py migrate-layout --recover` 恢复；输入被外部改动时停止并保留现场。路径或产物内容改变导致接受证据失效时，须经原生阶段接受或 continuity 核对重新收敛。
 
 在支持原生实施或检查 agent 的平台上，任务上下文清单（`implement.jsonl`、`check.jsonl`）用于提供相关规范和研究资料。只有这些 agent 会读取清单时才需要维护；清单不能替代任务资产或阶段证据。
 

package/dist/utils/ablation-store.d.ts

@@ -103,7 +103,7 @@ export declare function parseAblationState(value: unknown): AblationStateV1;
 export declare function stageAblationTransaction(input: StagedAblationInput, options?: StageAblationOptions): LoadedAblationTransaction;
 export declare function loadAblationTransaction(projectRoot: string, stateRoot?: string): LoadedAblationTransaction | null;
 export declare function transitionAblationState(transaction: LoadedAblationTransaction, status: AblationStatus): AblationStateV1;
-/** Serialize ablate/restore state and project mutations for one project. */
+/** Shared project maintenance boundary; asynchronous operations retain ownership. */
 export declare function withAblationProjectLock<T>(paths: TransactionPaths, operation: () => T): T;
 /** Preflight every affected path before restore writes anything. */
 export declare function collectRestoreConflicts(transaction: LoadedAblationTransaction): AblationConflict[];

package/dist/utils/ablation-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ablation-store.d.ts","sourceRoot":"","sources":["../../src/utils/ablation-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgBH,eAAO,MAAM,uBAAuB,IAAI,CAAC;AACzC,eAAO,MAAM,wBAAwB,EAAG,cAAuB,CAAC;AAChE,eAAO,MAAM,uBAAuB,gCAAgC,CAAC;AAErE,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,GAAG,UAAU,CAAC;AAEhF,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,eAAe,GACvB,iBAAiB,GACjB,eAAe,GACf,oBAAoB,GACpB,kBAAkB,CAAC;AAEvB,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,eAAe,CAAC;IACrB,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,CAAC,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,CAAC,OAAO,wBAAwB,CAAC,CAAC;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACnC,uEAAuE;IACvE,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,gBAAgB,CAAC;IACxB,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kEAAkE;IAClE,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,eAAe,CAAC;CACzB;AAED,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,SAAgB,SAAS,EAAE,gBAAgB,EAAE,CAAC;gBAE3B,SAAS,EAAE,gBAAgB,EAAE;CAOjD;AA8ED,iEAAiE;AACjE,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CA+BhE;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,GAAG,UAAU,EAC5B,IAAI,EAAE,MAAM,GACX,eAAe,CAQjB;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,eAAe,GACrB,OAAO,CAmBT;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAM7C;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,SAAS,SAAyB,GACjC,gBAAgB,CAYlB;AAqCD,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,IAAI,CAON;AA4GD,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,CAIlE;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,mBAAmB,EAC1B,OAAO,GAAE,oBAAyB,GACjC,yBAAyB,CA2E3B;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,SAAS,SAAyB,GACjC,yBAAyB,GAAG,IAAI,CA0BlC;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,yBAAyB,EACtC,MAAM,EAAE,cAAc,GACrB,eAAe,CAKjB;AAsED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,KAAK,EAAE,gBAAgB,EACvB,SAAS,EAAE,MAAM,CAAC,GACjB,CAAC,CAOH;AAED,oEAAoE;AACpE,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,yBAAyB,GACrC,gBAAgB,EAAE,CAoBpB;AA2LD,gFAAgF;AAChF,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,yBAAyB,EACtC,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9C,IAAI,CASN;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,yBAAyB,GACrC,IAAI,CAWN;AAED,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,yBAAyB,GACrC,IAAI,CAWN;AAED,4EAA4E;AAC5E,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,yBAAyB,EACtC,OAAO,GAAE,sBAA2B,GACnC,IAAI,CA+BN;AAED,gFAAgF;AAChF,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,yBAAyB,EACtC,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GACnC,IAAI,CAuBN;AAED,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,yBAAyB,GACrC,IAAI,CAEN"}
+{"version":3,"file":"ablation-store.d.ts","sourceRoot":"","sources":["../../src/utils/ablation-store.ts"],"names":[],"mappings":"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"}

package/dist/utils/ablation-store.js

@@ -412,8 +412,8 @@ function pidAlive(pid) {
         process.kill(pid, 0);
         return true;
     }
-    catch {
-        return false;
+    catch (error) {
+        return error.code !== "ESRCH";
     }
 }
 function acquireProjectLock(paths) {
@@ -421,41 +421,68 @@ function acquireProjectLock(paths) {
     for (let attempt = 0; attempt < 2; attempt += 1) {
         try {
             const fd = fs.openSync(paths.lockFile, "wx", 0o600);
+            const content = JSON.stringify({ pid: process.pid, nonce: randomUUID() });
             try {
-                fs.writeSync(fd, String(process.pid));
+                fs.writeSync(fd, content);
+                const stat = fs.fstatSync(fd);
+                return { content, ino: stat.ino, dev: stat.dev };
             }
             finally {
                 fs.closeSync(fd);
             }
-            return;
         }
         catch (error) {
             if (error.code !== "EEXIST")
                 throw error;
         }
-        let holderPid = 0;
-        try {
-            holderPid = Number(fs.readFileSync(paths.lockFile, "utf-8").trim());
+        const stat = fs.lstatSync(paths.lockFile);
+        if (!stat.isFile() || stat.isSymbolicLink()) {
+            throw new Error("Unknown Trellis maintenance lock; inspect it before retrying.");
         }
-        catch {
-            continue;
+        const content = fs.readFileSync(paths.lockFile, "utf-8").trim();
+        let holderPid;
+        if (/^[1-9]\d*$/.test(content))
+            holderPid = Number(content);
+        else {
+            try {
+                const record = JSON.parse(content);
+                if (record &&
+                    typeof record === "object" &&
+                    "pid" in record &&
+                    "nonce" in record &&
+                    typeof record.nonce === "string")
+                    holderPid = record.pid;
+            }
+            catch {
+                // An incomplete or unknown lock is not evidence that its owner exited.
+            }
         }
-        if (holderPid && pidAlive(holderPid)) {
-            throw new Error(`Another Trellis ablation operation is already in progress for this project (pid ${holderPid}).`);
+        if (typeof holderPid !== "number" ||
+            !Number.isSafeInteger(holderPid) ||
+            holderPid <= 0) {
+            throw new Error("Unknown Trellis maintenance lock; inspect it before retrying.");
         }
-        try {
-            fs.unlinkSync(paths.lockFile);
+        if (pidAlive(holderPid)) {
+            throw new Error(`Another Trellis maintenance operation is already in progress for this project (pid ${holderPid}).`);
         }
-        catch {
-            // A concurrent process changed the lock; retry the atomic create once.
+        const current = fs.lstatSync(paths.lockFile);
+        if (current.ino !== stat.ino ||
+            current.dev !== stat.dev ||
+            fs.readFileSync(paths.lockFile, "utf-8").trim() !== content) {
+            throw new Error("Trellis maintenance lock changed during inspection.");
         }
+        fs.unlinkSync(paths.lockFile);
     }
     throw new Error("Unable to acquire the Trellis ablation-operation lock; retry the command.");
 }
-function releaseProjectLock(paths) {
+function releaseProjectLock(paths, lock) {
     try {
-        const holder = fs.readFileSync(paths.lockFile, "utf-8").trim();
-        if (holder === String(process.pid)) {
+        const stat = fs.lstatSync(paths.lockFile);
+        if (stat.isFile() &&
+            !stat.isSymbolicLink() &&
+            stat.ino === lock.ino &&
+            stat.dev === lock.dev &&
+            fs.readFileSync(paths.lockFile, "utf-8") === lock.content) {
             fs.unlinkSync(paths.lockFile);
         }
     }
@@ -463,14 +490,21 @@ function releaseProjectLock(paths) {
         // Already released or replaced by another process.
     }
 }
-/** Serialize ablate/restore state and project mutations for one project. */
+/** Shared project maintenance boundary; asynchronous operations retain ownership. */
 export function withAblationProjectLock(paths, operation) {
-    acquireProjectLock(paths);
+    const lock = acquireProjectLock(paths);
+    let pending = false;
     try {
-        return operation();
+        const result = operation();
+        if (result instanceof Promise) {
+            pending = true;
+            return result.finally(() => releaseProjectLock(paths, lock));
+        }
+        return result;
     }
     finally {
-        releaseProjectLock(paths);
+        if (!pending)
+            releaseProjectLock(paths, lock);
     }
 }
 /** Preflight every affected path before restore writes anything. */
@@ -693,7 +727,7 @@ export function verifyAblatedState(transaction) {
 export function restoreAblationTransaction(transaction, options = {}) {
     const projectRoot = canonicalProjectRoot(transaction.state.projectRoot);
     const paths = getTransactionPaths(projectRoot, transaction.paths.stateRoot);
-    acquireProjectLock(paths);
+    const lock = acquireProjectLock(paths);
     try {
         const reloaded = loadAblationTransaction(projectRoot, paths.stateRoot);
         if (!reloaded) {
@@ -717,7 +751,7 @@ export function restoreAblationTransaction(transaction, options = {}) {
             deleteAblationTransaction(transaction);
     }
     finally {
-        releaseProjectLock(paths);
+        releaseProjectLock(paths, lock);
     }
 }
 /** Roll back this process's partial ablation while holding the project lock. */