@pennixrv/trellis 0.7.1-beta.4 → 0.7.1-beta.6

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

@@ -101,7 +101,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 +121,7 @@ def _record_start_state(
             file=sys.stderr,
         )
         print(hint, file=sys.stderr)
-        return
+        return task_json_path
 
     applied: list[str] = []
 
@@ -132,7 +132,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 +158,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 +178,7 @@ def _record_start_state(
             ),
             file=sys.stderr,
         )
-        return
+        return task_json_path
 
     for line in applied:
         print(colored(line, Colors.GREEN))
@@ -190,12 +193,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."""
@@ -256,18 +262,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
 
     active = set_active_task(task_dir, repo_root)
     if active:
-        print(colored(f"✓ Current task set to: {task_dir}", Colors.GREEN))
-        print(f"Source: {active.source}")
-
         if task_json_path.is_file():
-            _record_start_state(task_json_path, repo_root)
+            task_json_path = _record_start_state(task_json_path, repo_root)
 
+        print(colored(f"✓ Current task set to: {task_json_path.parent.relative_to(repo_root).as_posix()}", Colors.GREEN))
+        print(f"Source: {active.source}")
         print()
         print(colored("The hook will now inject context from this task's jsonl files.", Colors.BLUE))
 
@@ -499,7 +504,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,
@@ -538,7 +543,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)}"
@@ -622,7 +627,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:
@@ -849,16 +854,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,
@@ -881,12 +888,23 @@ 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 (ValueError, OSError) as error:
+        print(f"TASK_LAYOUT_WITHHELD: {error}", file=sys.stderr)
         return 1
 
 

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>]
@@ -34,7 +34,9 @@ python3 ./.trellis/scripts/task.py cancel <task> --reason "<reason>" --evidence-
 
 使用 `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>`，并在同一事务中清除任务的运行时会话指针。
+
+旧布局须先预览 `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/package.json

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