trellis-hgl 0.6.0-beta.28 → 0.6.0-beta.29

package/dist/migrations/manifests/0.6.0-beta.29.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.6.0-beta.29",
+  "description": "Beta 补丁：补齐 Claude shared worktree 的 .trellis/scripts bootstrap，并修正 worktree 漂移检测与覆盖保护。",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "**修复：**\n- fix(worktree): Claude shared worktree 与 Trellis-managed worktree 在派发前会同步 `.trellis/scripts/`、`.trellis/workflow.md`、`.trellis/config.yaml` 与 `.trellis/.gitignore`，避免 subagent 在 worktree 内执行 `./.trellis/scripts/*` 时因缺少脚本而报错。\n- fix(hooks): `inject-subagent-context.py`、`session-start.py` 与 `common/worktree_sync.py` 现在共享同一套 bootstrap、planning snapshot 同步与 drift 检测逻辑，模板与 dogfood 副本保持一致。\n- fix(worktree): \"local code changes\" 现在基于 `git status --porcelain -z --untracked-files=all` 判断，已填充但 git-clean 的 worktree 不再被误判为 dirty；真正有代码改动时仍会阻止主工作区自动覆盖。\n\n**说明：**\n- 现有项目执行 `trellis update` 后即可获得新的 shared worktree scripts/bootstrap 与漂移保护修复。",
+  "migrations": [],
+  "notes": "安装此版本后请运行 `trellis update`，以同步生成的 shared worktree hooks、`.trellis/scripts/` 与 planning drift 保护逻辑；除非你本地手改过生成模板，否则无需手动迁移。"
+}

package/dist/templates/shared-hooks/inject-subagent-context.py

@@ -49,8 +49,6 @@ if sys.platform.startswith("win"):
 DIR_WORKFLOW = ".trellis"
 DIR_SPEC = "spec"
 FILE_TASK_JSON = "task.json"
-WORKTREE_PARENT_DIR = ".trellis"
-WORKTREE_ROOT_DIR = "trellis-worktrees"
 
 # =============================================================================
 # Subagent Constants (change here to rename subagent types)
@@ -95,21 +93,64 @@ def find_repo_root(start_path: str) -> str | None:
     return None
 
 
+def _candidate_scripts_dirs(repo_root: Path) -> list[Path]:
+    candidates = [repo_root / DIR_WORKFLOW / "scripts"]
+    try:
+        if repo_root.parent.name == "trellis-worktrees" and repo_root.parent.parent.name == DIR_WORKFLOW:
+            candidates.insert(0, repo_root.parent.parent.parent / DIR_WORKFLOW / "scripts")
+    except Exception:
+        pass
+    return candidates
+
+
+def _load_worktree_sync(repo_root: str):
+    repo_path = Path(repo_root).resolve()
+    for scripts_dir in _candidate_scripts_dirs(repo_path):
+        if str(scripts_dir) not in sys.path:
+            sys.path.insert(0, str(scripts_dir))
+        try:
+            from common import worktree_sync  # type: ignore[import-not-found]
+            return worktree_sync
+        except Exception:
+            continue
+    return None
+
+
 def _infer_worktree_task(repo_root: str) -> str | None:
-    root = Path(repo_root).resolve()
+    worktree_sync = _load_worktree_sync(repo_root)
+    if worktree_sync is None:
+        return None
     try:
-        if root.parent.name != WORKTREE_ROOT_DIR:
-            return None
-        if root.parent.parent.name != WORKTREE_PARENT_DIR:
-            return None
+        return worktree_sync.infer_managed_worktree_task(Path(repo_root).resolve())
     except Exception:
         return None
 
-    task_dir_name = root.name
-    task_dir = root / DIR_WORKFLOW / "tasks" / task_dir_name
-    if not task_dir.is_dir():
-        return None
-    return f".trellis/tasks/{task_dir_name}"
+
+def ensure_shared_worktree_bootstrap(repo_root: str, task_dir: str | None) -> None:
+    if not task_dir:
+        return
+
+    worktree_sync = _load_worktree_sync(repo_root)
+    if worktree_sync is None:
+        return
+
+    task_dir_name = Path(task_dir).name
+    if not task_dir_name:
+        return
+
+    resolved = worktree_sync.resolve_shared_worktree_roots(
+        Path(repo_root).resolve(),
+        task_dir_name,
+    )
+    if not resolved:
+        return
+
+    main_root, worktree_root = resolved
+    worktree_sync.sync_runtime_bundle(main_root, worktree_root)
+
+    target_task_dir = worktree_sync.task_dir(worktree_root, task_dir_name)
+    if not worktree_sync.has_any_task_artifact(target_task_dir):
+        worktree_sync.sync_task_snapshot(main_root, worktree_root, task_dir_name)
 
 
 def _detect_platform(input_data: dict) -> str | None:
@@ -880,6 +921,15 @@ def _looks_like_path_key(key: str | None) -> bool:
     return lowered.endswith(("_path", "_paths", "_file", "_files", "_dir", "_root"))
 
 
+def _extract_shared_worktree_task_name(path_value: Any) -> str | None:
+    normalized = _normalize_hook_text(path_value)
+    if CLAUDE_SHARED_WORKTREE_MARKER not in normalized:
+        return None
+    suffix = normalized.split(CLAUDE_SHARED_WORKTREE_MARKER, 1)[1]
+    task_name = suffix.split("/", 1)[0].strip()
+    return task_name or None
+
+
 def _tool_input_targets_shared_worktree(value: Any, key: str | None = None) -> bool:
     if isinstance(value, dict):
         for nested_key, nested_value in value.items():
@@ -896,6 +946,40 @@ def _tool_input_targets_shared_worktree(value: Any, key: str | None = None) -> b
     return _path_uses_shared_worktree(value)
 
 
+def _tool_input_shared_worktree_task(value: Any, key: str | None = None) -> str | None:
+    if isinstance(value, dict):
+        for nested_key, nested_value in value.items():
+            task_name = _tool_input_shared_worktree_task(nested_value, str(nested_key))
+            if task_name:
+                return task_name
+        return None
+    if isinstance(value, list):
+        for item in value:
+            task_name = _tool_input_shared_worktree_task(item, key)
+            if task_name:
+                return task_name
+        return None
+    if not _looks_like_path_key(key):
+        return None
+    return _extract_shared_worktree_task_name(value)
+
+
+def infer_task_dir_from_shared_worktree_signal(
+    repo_root: str,
+    tool_input: dict,
+    cwd: str,
+) -> str | None:
+    for path_value in (cwd, repo_root):
+        task_name = _extract_shared_worktree_task_name(path_value)
+        if task_name:
+            return f".trellis/tasks/{task_name}"
+
+    task_name = _tool_input_shared_worktree_task(tool_input)
+    if task_name:
+        return f".trellis/tasks/{task_name}"
+    return None
+
+
 def has_shared_worktree_signal(
     repo_root: str,
     task_dir: str | None,
@@ -964,6 +1048,8 @@ def main():
 
     # Get current task directory (research doesn't require it)
     task_dir = get_current_task(repo_root, input_data)
+    if not task_dir and is_claude_code_dev_agent(subagent_type):
+        task_dir = infer_task_dir_from_shared_worktree_signal(repo_root, tool_input, cwd)
 
     # implement/check/review need task directory
     if subagent_type in AGENTS_REQUIRE_TASK:
@@ -977,8 +1063,17 @@ def main():
     hook_notice = ""
     hook_system_message = ""
     normalized_tool_input = tool_input
+    shared_worktree_signal = False
+
     if platform == "claude" and is_claude_code_dev_agent(subagent_type):
-        if has_shared_worktree_signal(repo_root, task_dir, tool_input, cwd):
+        shared_worktree_signal = has_shared_worktree_signal(
+            repo_root,
+            task_dir,
+            tool_input,
+            cwd,
+        )
+        if shared_worktree_signal:
+            ensure_shared_worktree_bootstrap(repo_root, task_dir)
             normalized_tool_input, stripped = strip_conflicting_worktree_isolation(tool_input)
             if stripped:
                 hook_notice = _build_shared_worktree_conflict_notice(task_dir)

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

@@ -9,12 +9,10 @@ from __future__ import annotations
 import warnings
 warnings.filterwarnings("ignore")
 
-import hashlib
 import json
 import os
 import re
 import shlex
-import shutil
 import subprocess
 import sys
 from io import StringIO
@@ -99,210 +97,28 @@ if sys.platform.startswith("win"):
 
 WORKTREE_PARENT_DIR = ".trellis"
 WORKTREE_ROOT_DIR = "trellis-worktrees"
-RUNTIME_BUNDLE_FILES = (
-    ".trellis/workflow.md",
-    ".trellis/config.yaml",
-    ".trellis/.gitignore",
-)
-RUNTIME_BUNDLE_DIRS = (
-    ".trellis/scripts",
-)
-PLANNING_FILE_NAMES = (
-    "task.json",
-    "prd.md",
-    "design.md",
-    "implement.md",
-    "implement.jsonl",
-    "check.jsonl",
-)
-PLANNING_DIR_NAMES = ("research",)
-
-
-def _remove_path(path: Path) -> None:
-    if path.is_symlink() or path.is_file():
-        path.unlink()
-        return
-    if path.is_dir():
-        shutil.rmtree(path)
-
-
-def _hash_file(path: Path) -> str:
-    digest = hashlib.sha256()
-    with path.open("rb") as handle:
-        for chunk in iter(lambda: handle.read(65536), b""):
-            digest.update(chunk)
-    return digest.hexdigest()
-
-
-def _snapshot_dir(path: Path) -> dict[str, str]:
-    if not path.is_dir():
-        return {}
-    snapshot: dict[str, str] = {}
-    for child in sorted(path.rglob("*")):
-        if child.is_file():
-            snapshot[child.relative_to(path).as_posix()] = _hash_file(child)
-    return snapshot
-
-
-def _same_file(src: Path, dst: Path) -> bool:
-    return src.is_file() and dst.is_file() and _hash_file(src) == _hash_file(dst)
-
-
-def _same_tree(src: Path, dst: Path) -> bool:
-    return src.is_dir() and dst.is_dir() and _snapshot_dir(src) == _snapshot_dir(dst)
-
 
-def _copy_file(src: Path, dst: Path) -> None:
-    dst.parent.mkdir(parents=True, exist_ok=True)
-    shutil.copy2(src, dst)
 
-
-def _copy_tree(src: Path, dst: Path) -> None:
-    if dst.exists():
-        _remove_path(dst)
-    dst.parent.mkdir(parents=True, exist_ok=True)
-    shutil.copytree(src, dst)
-
-
-def _detect_trellis_managed_worktree(repo_root: Path) -> tuple[Path, str] | None:
+def _candidate_scripts_dirs(repo_root: Path) -> list[Path]:
+    candidates = [repo_root / ".trellis" / "scripts"]
     try:
-        if repo_root.parent.name != WORKTREE_ROOT_DIR:
-            return None
-        if repo_root.parent.parent.name != WORKTREE_PARENT_DIR:
-            return None
-        main_root = repo_root.parent.parent.parent
-        if not (main_root / ".git").exists():
-            return None
-        return main_root, repo_root.name
+        if repo_root.parent.name == WORKTREE_ROOT_DIR and repo_root.parent.parent.name == WORKTREE_PARENT_DIR:
+            candidates.insert(0, repo_root.parent.parent.parent / ".trellis" / "scripts")
     except Exception:
-        return None
-
-
-def _task_dir(repo_root: Path, task_dir_name: str) -> Path:
-    return repo_root / ".trellis" / "tasks" / task_dir_name
-
-
-def _task_snapshot(task_dir: Path) -> dict[str, str]:
-    snapshot: dict[str, str] = {}
-    for name in PLANNING_FILE_NAMES:
-        file_path = task_dir / name
-        if file_path.is_file():
-            snapshot[name] = _hash_file(file_path)
-    for name in PLANNING_DIR_NAMES:
-        dir_path = task_dir / name
-        if not dir_path.is_dir():
-            continue
-        for child in sorted(dir_path.rglob("*")):
-            if child.is_file():
-                snapshot[child.relative_to(task_dir).as_posix()] = _hash_file(child)
-    return snapshot
-
-
-def _has_any_task_artifact(task_dir: Path) -> bool:
-    for name in PLANNING_FILE_NAMES:
-        if (task_dir / name).is_file():
-            return True
-    for name in PLANNING_DIR_NAMES:
-        if (task_dir / name).exists():
-            return True
-    return False
-
-
-def _sync_runtime_bundle(main_root: Path, worktree_root: Path) -> list[str]:
-    synced: list[str] = []
-    for relative_path in RUNTIME_BUNDLE_FILES:
-        src = main_root / relative_path
-        dst = worktree_root / relative_path
-        if not src.is_file() or _same_file(src, dst):
-            continue
-        _copy_file(src, dst)
-        synced.append(relative_path)
-    for relative_path in RUNTIME_BUNDLE_DIRS:
-        src = main_root / relative_path
-        dst = worktree_root / relative_path
-        if not src.is_dir() or _same_tree(src, dst):
-            continue
-        _copy_tree(src, dst)
-        synced.append(relative_path)
-    return synced
-
-
-def _sync_task_snapshot(main_root: Path, worktree_root: Path, task_dir_name: str) -> list[str]:
-    source_task_dir = _task_dir(main_root, task_dir_name)
-    target_task_dir = _task_dir(worktree_root, task_dir_name)
-    if not source_task_dir.is_dir():
-        return []
-
-    synced: list[str] = []
-    for name in PLANNING_FILE_NAMES:
-        src = source_task_dir / name
-        if not src.is_file():
-            continue
-        dst = target_task_dir / name
-        if _same_file(src, dst):
-            continue
-        _copy_file(src, dst)
-        synced.append(name)
-
-    for name in PLANNING_DIR_NAMES:
-        src = source_task_dir / name
-        if not src.is_dir():
-            continue
-        dst = target_task_dir / name
-        if _same_tree(src, dst):
-            continue
-        _copy_tree(src, dst)
-        synced.append(name)
-
-    return synced
-
-
-def _collect_task_drift(main_root: Path, worktree_root: Path, task_dir_name: str) -> list[str]:
-    source_snapshot = _task_snapshot(_task_dir(main_root, task_dir_name))
-    target_snapshot = _task_snapshot(_task_dir(worktree_root, task_dir_name))
-    keys = sorted(set(source_snapshot) | set(target_snapshot))
-    return [key for key in keys if source_snapshot.get(key) != target_snapshot.get(key)]
-
-
-def _is_managed_worktree_path(path_str: str, task_dir_name: str) -> bool:
-    normalized = path_str.replace("\\", "/").strip().strip("/")
-
-    for relative_path in RUNTIME_BUNDLE_FILES:
-        runtime_path = relative_path.strip("/")
-        if normalized == runtime_path:
-            return True
-    for relative_path in RUNTIME_BUNDLE_DIRS:
-        runtime_dir = relative_path.strip("/")
-        if normalized == runtime_dir or normalized.startswith(runtime_dir + "/"):
-            return True
-
-    task_root = f".trellis/tasks/{task_dir_name}"
-    if normalized in (".trellis/tasks", task_root):
-        return True
-    task_prefix = task_root + "/"
-    if not normalized.startswith(task_prefix):
-        return False
-    task_relative = normalized[len(task_prefix):]
-    if not task_relative:
-        return True
-    if task_relative in PLANNING_FILE_NAMES:
-        return True
-    for dir_name in PLANNING_DIR_NAMES:
-        if task_relative == dir_name or task_relative.startswith(dir_name + "/"):
-            return True
-    return False
+        pass
+    return candidates
 
 
-def _worktree_has_local_code_changes(worktree_root: Path, task_dir_name: str) -> bool:
-    if not worktree_root.exists():
-        return False
-    for child in sorted(worktree_root.rglob("*")):
-        if child.is_dir():
+def _load_worktree_sync(repo_root: Path):
+    for scripts_dir in _candidate_scripts_dirs(repo_root):
+        if str(scripts_dir) not in sys.path:
+            sys.path.insert(0, str(scripts_dir))
+        try:
+            from common import worktree_sync  # type: ignore[import-not-found]
+            return worktree_sync
+        except Exception:
             continue
-        relative_path = child.relative_to(worktree_root).as_posix()
-        if not _is_managed_worktree_path(relative_path, task_dir_name):
-            return True
-    return False
+    return None
 
 
 def _format_changed_paths(paths: list[str], limit: int = 6) -> str:
@@ -313,7 +129,11 @@ def _format_changed_paths(paths: list[str], limit: int = 6) -> str:
 
 def _maybe_sync_trellis_worktree(project_dir: Path) -> str:
     try:
-        detected = _detect_trellis_managed_worktree(project_dir)
+        worktree_sync = _load_worktree_sync(project_dir)
+        if worktree_sync is None:
+            return ""
+
+        detected = worktree_sync.detect_trellis_managed_worktree(project_dir)
         if not detected:
             return ""
 
@@ -322,29 +142,29 @@ def _maybe_sync_trellis_worktree(project_dir: Path) -> str:
             f"Detected Trellis-managed worktree: ./.trellis/trellis-worktrees/{task_dir_name}/",
         ]
 
-        runtime_synced = _sync_runtime_bundle(main_root, project_dir)
+        runtime_synced = worktree_sync.sync_runtime_bundle(main_root, project_dir)
         if runtime_synced:
             notes.append(
                 "Bootstrapped runtime bundle from main workspace: "
                 + ", ".join(runtime_synced)
             )
 
-        target_task_dir = _task_dir(project_dir, task_dir_name)
-        if not _has_any_task_artifact(target_task_dir):
-            planning_synced = _sync_task_snapshot(main_root, project_dir, task_dir_name)
+        target_task_dir = worktree_sync.task_dir(project_dir, task_dir_name)
+        if not worktree_sync.has_any_task_artifact(target_task_dir):
+            planning_synced = worktree_sync.sync_task_snapshot(main_root, project_dir, task_dir_name)
             if planning_synced:
                 notes.append(
                     "Bootstrapped current task planning snapshot from main workspace: "
                     + ", ".join(planning_synced)
                 )
 
-        drift = _collect_task_drift(main_root, project_dir, task_dir_name)
+        drift = worktree_sync.collect_task_drift(main_root, project_dir, task_dir_name)
         if drift:
             notes.append(
                 "Planning drift detected between main workspace and worktree: "
                 + _format_changed_paths(drift)
             )
-            if _worktree_has_local_code_changes(project_dir, task_dir_name):
+            if worktree_sync.worktree_has_local_code_changes(project_dir, task_dir_name):
                 notes.append(
                     "Do NOT auto-overwrite: this worktree has local code changes. "
                     "Explain the conflict first, recommend creating a new Trellis task "
@@ -594,14 +414,13 @@ def run_script(script_path: Path, context_key: str | None = None) -> str:
 
 
 def _infer_worktree_task_ref(repo_root: Path) -> str | None:
-    detected = _detect_trellis_managed_worktree(repo_root)
-    if not detected:
+    worktree_sync = _load_worktree_sync(repo_root)
+    if worktree_sync is None:
         return None
-    _, task_dir_name = detected
-    task_dir = _task_dir(repo_root, task_dir_name)
-    if not task_dir.is_dir():
+    try:
+        return worktree_sync.infer_managed_worktree_task(repo_root)
+    except Exception:
         return None
-    return f".trellis/tasks/{task_dir_name}"
 
 
 def _normalize_task_ref(task_ref: str) -> str:

package/dist/templates/trellis/index.d.ts

@@ -37,6 +37,7 @@ export declare const commonPackagesContext: string;
 export declare const commonWorkflowPhase: string;
 export declare const commonTrellisConfig: string;
 export declare const commonSafeCommit: string;
+export declare const commonWorktreeSync: string;
 export declare const trellisSwitch: string;
 export declare const assertTrellisEnabled: string;
 export declare const getDeveloperScript: string;

package/dist/templates/trellis/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/templates/trellis/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAcH,eAAO,MAAM,WAAW,QAAsC,CAAC;AAG/D,eAAO,MAAM,UAAU,QAA6C,CAAC;AACrE,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,eAAe,QAA8C,CAAC;AAC3E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,YAAY,QAA2C,CAAC;AACrE,eAAO,MAAM,QAAQ,QAAuC,CAAC;AAC7D,eAAO,MAAM,SAAS,QAAwC,CAAC;AAC/D,eAAO,MAAM,SAAS,QAAwC,CAAC;AAC/D,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,iBAAiB,QAAiD,CAAC;AAChF,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,oBAAoB,QAEhC,CAAC;AACF,eAAO,MAAM,qBAAqB,QAEjC,CAAC;AACF,eAAO,MAAM,mBAAmB,QAE/B,CAAC;AACF,eAAO,MAAM,mBAAmB,QAE/B,CAAC;AACF,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,aAAa,QAA4C,CAAC;AACvE,eAAO,MAAM,oBAAoB,QAAoD,CAAC;AAGtF,eAAO,MAAM,kBAAkB,QAA2C,CAAC;AAC3E,eAAO,MAAM,mBAAmB,QAA4C,CAAC;AAC7E,eAAO,MAAM,UAAU,QAAkC,CAAC;AAC1D,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AACvE,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AAGvE,eAAO,MAAM,kBAAkB,QAA8B,CAAC;AAC9D,eAAO,MAAM,kBAAkB,QAA8B,CAAC;AAC9D,eAAO,MAAM,iBAAiB,QAAgC,CAAC;AAE/D;;GAEG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAuCnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/templates/trellis/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAcH,eAAO,MAAM,WAAW,QAAsC,CAAC;AAG/D,eAAO,MAAM,UAAU,QAA6C,CAAC;AACrE,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,eAAe,QAA8C,CAAC;AAC3E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,YAAY,QAA2C,CAAC;AACrE,eAAO,MAAM,QAAQ,QAAuC,CAAC;AAC7D,eAAO,MAAM,SAAS,QAAwC,CAAC;AAC/D,eAAO,MAAM,SAAS,QAAwC,CAAC;AAC/D,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,iBAAiB,QAAiD,CAAC;AAChF,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,oBAAoB,QAEhC,CAAC;AACF,eAAO,MAAM,qBAAqB,QAEjC,CAAC;AACF,eAAO,MAAM,mBAAmB,QAE/B,CAAC;AACF,eAAO,MAAM,mBAAmB,QAE/B,CAAC;AACF,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,kBAAkB,QAAkD,CAAC;AAClF,eAAO,MAAM,aAAa,QAA4C,CAAC;AACvE,eAAO,MAAM,oBAAoB,QAAoD,CAAC;AAGtF,eAAO,MAAM,kBAAkB,QAA2C,CAAC;AAC3E,eAAO,MAAM,mBAAmB,QAA4C,CAAC;AAC7E,eAAO,MAAM,UAAU,QAAkC,CAAC;AAC1D,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AACvE,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AAGvE,eAAO,MAAM,kBAAkB,QAA8B,CAAC;AAC9D,eAAO,MAAM,kBAAkB,QAA8B,CAAC;AAC9D,eAAO,MAAM,iBAAiB,QAAgC,CAAC;AAE/D;;GAEG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAwCnD"}

package/dist/templates/trellis/index.js

@@ -47,6 +47,7 @@ export const commonPackagesContext = readTemplate("scripts/common/packages_conte
 export const commonWorkflowPhase = readTemplate("scripts/common/workflow_phase.py");
 export const commonTrellisConfig = readTemplate("scripts/common/trellis_config.py");
 export const commonSafeCommit = readTemplate("scripts/common/safe_commit.py");
+export const commonWorktreeSync = readTemplate("scripts/common/worktree_sync.py");
 export const trellisSwitch = readTemplate("scripts/trellis_switch.py");
 export const assertTrellisEnabled = readTemplate("scripts/assert_trellis_enabled.py");
 // Python scripts - main
@@ -88,6 +89,7 @@ export function getAllScripts() {
     scripts.set("common/workflow_phase.py", commonWorkflowPhase);
     scripts.set("common/trellis_config.py", commonTrellisConfig);
     scripts.set("common/safe_commit.py", commonSafeCommit);
+    scripts.set("common/worktree_sync.py", commonWorktreeSync);
     // Main
     scripts.set("get_developer.py", getDeveloperScript);
     scripts.set("init_developer.py", initDeveloperScript);

package/dist/templates/trellis/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/templates/trellis/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/templates/trellis/index.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,273 @@
+from __future__ import annotations
+
+import hashlib
+import shutil
+from pathlib import Path
+
+from common.git import run_git
+
+DIR_WORKFLOW = ".trellis"
+WORKTREE_PARENT_DIR = ".trellis"
+WORKTREE_ROOT_DIR = "trellis-worktrees"
+RUNTIME_BUNDLE_FILES = (
+    ".trellis/workflow.md",
+    ".trellis/config.yaml",
+    ".trellis/.gitignore",
+)
+RUNTIME_BUNDLE_DIRS = (
+    ".trellis/scripts",
+)
+PLANNING_FILE_NAMES = (
+    "task.json",
+    "prd.md",
+    "design.md",
+    "implement.md",
+    "implement.jsonl",
+    "check.jsonl",
+)
+PLANNING_DIR_NAMES = ("research",)
+
+
+def _remove_path(path: Path) -> None:
+    if path.is_symlink() or path.is_file():
+        path.unlink()
+        return
+    if path.is_dir():
+        shutil.rmtree(path)
+
+
+def _hash_file(path: Path) -> str:
+    digest = hashlib.sha256()
+    with path.open("rb") as handle:
+        for chunk in iter(lambda: handle.read(65536), b""):
+            digest.update(chunk)
+    return digest.hexdigest()
+
+
+def _snapshot_dir(path: Path) -> dict[str, str]:
+    if not path.is_dir():
+        return {}
+    snapshot: dict[str, str] = {}
+    for child in sorted(path.rglob("*")):
+        if child.is_file():
+            snapshot[child.relative_to(path).as_posix()] = _hash_file(child)
+    return snapshot
+
+
+def _same_file(src: Path, dst: Path) -> bool:
+    return src.is_file() and dst.is_file() and _hash_file(src) == _hash_file(dst)
+
+
+def _same_tree(src: Path, dst: Path) -> bool:
+    return src.is_dir() and dst.is_dir() and _snapshot_dir(src) == _snapshot_dir(dst)
+
+
+def _copy_file(src: Path, dst: Path) -> None:
+    dst.parent.mkdir(parents=True, exist_ok=True)
+    shutil.copy2(src, dst)
+
+
+def _copy_tree(src: Path, dst: Path) -> None:
+    if dst.exists():
+        _remove_path(dst)
+    dst.parent.mkdir(parents=True, exist_ok=True)
+    shutil.copytree(src, dst)
+
+
+def task_dir(repo_root: Path, task_dir_name: str) -> Path:
+    return repo_root / DIR_WORKFLOW / "tasks" / task_dir_name
+
+
+def detect_trellis_managed_worktree(repo_root: Path) -> tuple[Path, str] | None:
+    try:
+        if repo_root.parent.name != WORKTREE_ROOT_DIR:
+            return None
+        if repo_root.parent.parent.name != WORKTREE_PARENT_DIR:
+            return None
+        main_root = repo_root.parent.parent.parent
+        if not (main_root / ".git").exists():
+            return None
+        return main_root, repo_root.name
+    except Exception:
+        return None
+
+
+def infer_managed_worktree_task(repo_root: Path) -> str | None:
+    detected = detect_trellis_managed_worktree(repo_root)
+    if not detected:
+        return None
+    _, task_dir_name = detected
+    if not task_dir(repo_root, task_dir_name).is_dir():
+        return None
+    return f".trellis/tasks/{task_dir_name}"
+
+
+def resolve_shared_worktree_roots(
+    repo_root: Path,
+    task_dir_name: str,
+) -> tuple[Path, Path] | None:
+    detected = detect_trellis_managed_worktree(repo_root)
+    if detected:
+        main_root, inferred_task_dir_name = detected
+        if inferred_task_dir_name != task_dir_name:
+            return None
+        return main_root, repo_root
+
+    main_root = repo_root
+    worktree_root = repo_root / WORKTREE_PARENT_DIR / WORKTREE_ROOT_DIR / task_dir_name
+    if not worktree_root.exists():
+        return None
+    if not (main_root / DIR_WORKFLOW / "scripts").is_dir():
+        return None
+    return main_root, worktree_root
+
+
+def task_snapshot(task_dir_path: Path) -> dict[str, str]:
+    snapshot: dict[str, str] = {}
+    for name in PLANNING_FILE_NAMES:
+        file_path = task_dir_path / name
+        if file_path.is_file():
+            snapshot[name] = _hash_file(file_path)
+    for name in PLANNING_DIR_NAMES:
+        dir_path = task_dir_path / name
+        if not dir_path.is_dir():
+            continue
+        for child in sorted(dir_path.rglob("*")):
+            if child.is_file():
+                snapshot[child.relative_to(task_dir_path).as_posix()] = _hash_file(child)
+    return snapshot
+
+
+def has_any_task_artifact(task_dir_path: Path) -> bool:
+    for name in PLANNING_FILE_NAMES:
+        if (task_dir_path / name).is_file():
+            return True
+    for name in PLANNING_DIR_NAMES:
+        if (task_dir_path / name).exists():
+            return True
+    return False
+
+
+def sync_runtime_bundle(main_root: Path, worktree_root: Path) -> list[str]:
+    synced: list[str] = []
+    for relative_path in RUNTIME_BUNDLE_FILES:
+        src = main_root / relative_path
+        dst = worktree_root / relative_path
+        if not src.is_file() or _same_file(src, dst):
+            continue
+        _copy_file(src, dst)
+        synced.append(relative_path)
+    for relative_path in RUNTIME_BUNDLE_DIRS:
+        src = main_root / relative_path
+        dst = worktree_root / relative_path
+        if not src.is_dir() or _same_tree(src, dst):
+            continue
+        _copy_tree(src, dst)
+        synced.append(relative_path)
+    return synced
+
+
+def sync_task_snapshot(main_root: Path, worktree_root: Path, task_dir_name: str) -> list[str]:
+    source_task_dir = task_dir(main_root, task_dir_name)
+    target_task_dir = task_dir(worktree_root, task_dir_name)
+    if not source_task_dir.is_dir():
+        return []
+
+    synced: list[str] = []
+    for name in PLANNING_FILE_NAMES:
+        src = source_task_dir / name
+        if not src.is_file():
+            continue
+        dst = target_task_dir / name
+        if _same_file(src, dst):
+            continue
+        _copy_file(src, dst)
+        synced.append(name)
+
+    for name in PLANNING_DIR_NAMES:
+        src = source_task_dir / name
+        if not src.is_dir():
+            continue
+        dst = target_task_dir / name
+        if _same_tree(src, dst):
+            continue
+        _copy_tree(src, dst)
+        synced.append(name)
+
+    return synced
+
+
+def collect_task_drift(main_root: Path, worktree_root: Path, task_dir_name: str) -> list[str]:
+    source_snapshot = task_snapshot(task_dir(main_root, task_dir_name))
+    target_snapshot = task_snapshot(task_dir(worktree_root, task_dir_name))
+    keys = sorted(set(source_snapshot) | set(target_snapshot))
+    return [key for key in keys if source_snapshot.get(key) != target_snapshot.get(key)]
+
+
+def _is_managed_worktree_path(path_str: str, task_dir_name: str) -> bool:
+    normalized = path_str.replace("\\", "/").strip().strip("/")
+
+    for relative_path in RUNTIME_BUNDLE_FILES:
+        runtime_path = relative_path.strip("/")
+        if normalized == runtime_path:
+            return True
+    for relative_path in RUNTIME_BUNDLE_DIRS:
+        runtime_dir = relative_path.strip("/")
+        if normalized == runtime_dir or normalized.startswith(runtime_dir + "/"):
+            return True
+
+    task_root = f".trellis/tasks/{task_dir_name}"
+    if normalized in (".trellis/tasks", task_root):
+        return True
+    task_prefix = task_root + "/"
+    if not normalized.startswith(task_prefix):
+        return False
+    task_relative = normalized[len(task_prefix):]
+    if not task_relative:
+        return True
+    if task_relative in PLANNING_FILE_NAMES:
+        return True
+    for dir_name in PLANNING_DIR_NAMES:
+        if task_relative == dir_name or task_relative.startswith(dir_name + "/"):
+            return True
+    return False
+
+
+def _changed_paths_from_git_status(worktree_root: Path) -> list[str]:
+    code, stdout, _ = run_git(
+        ["status", "--porcelain", "-z", "--untracked-files=all"],
+        cwd=worktree_root,
+    )
+    if code != 0:
+        return []
+
+    changed_paths: list[str] = []
+    entries = stdout.split("\0")
+    index = 0
+    while index < len(entries):
+        entry = entries[index]
+        if not entry:
+            index += 1
+            continue
+
+        status = entry[:2]
+        if len(entry) > 3:
+            changed_paths.append(entry[3:].replace("\\", "/"))
+
+        if "R" in status or "C" in status:
+            index += 1
+            if index < len(entries) and entries[index]:
+                changed_paths.append(entries[index].replace("\\", "/"))
+
+        index += 1
+
+    return changed_paths
+
+
+def worktree_has_local_code_changes(worktree_root: Path, task_dir_name: str) -> bool:
+    if not worktree_root.exists():
+        return False
+    for relative_path in _changed_paths_from_git_status(worktree_root):
+        if not _is_managed_worktree_path(relative_path, task_dir_name):
+            return True
+    return False

package/package.json

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