@pennixrv/trellis 0.7.0-beta.9 → 0.7.1-beta.0

package/dist/templates/trellis/index.js

@@ -10,8 +10,8 @@
  *   │   ├── __init__.py
  *   │   ├── common/           # Shared utilities (Python)
  *   │   └── *.py              # Main scripts (Python)
- *   ├── agents/                # Channel runtime agent definitions and assets
- *   │   └── *.md / *.env       # Loaded by the channel runtime
+ *   ├── agents/                # Teamwork runtime agent definitions
+ *   │   └── *.md               # Loaded by `trellis teamwork spawn --agent <name>`
  *   ├── scripts-shell-archive/ # Archived shell scripts (for reference)
  *   ├── workflow.md           # Workflow guide
  *   ├── config.yaml            # Trellis configuration
@@ -44,11 +44,10 @@ export const commonGit = readTemplate("scripts/common/git.py");
 export const commonTypes = readTemplate("scripts/common/types.py");
 export const commonTasks = readTemplate("scripts/common/tasks.py");
 export const commonTaskContext = readTemplate("scripts/common/task_context.py");
-export const commonContextProjection = readTemplate("scripts/common/context_projection.py");
 export const commonTaskStore = readTemplate("scripts/common/task_store.py");
+export const commonTaskWorkflow = readTemplate("scripts/common/task_workflow.py");
+export const commonTaskContinuity = readTemplate("scripts/common/task_continuity.py");
 export const commonSessionContext = readTemplate("scripts/common/session_context.py");
-export const commonContinuationRecord = readTemplate("scripts/common/continuation_record.py");
-export const commonOwnershipRecord = readTemplate("scripts/common/ownership_record.py");
 export const commonPackagesContext = readTemplate("scripts/common/packages_context.py");
 export const commonWorkflowPhase = readTemplate("scripts/common/workflow_phase.py");
 export const commonWorkflowSelection = readTemplate("scripts/common/workflow_selection.py");
@@ -62,21 +61,15 @@ export const initDeveloperScript = readTemplate("scripts/init_developer.py");
 export const taskScript = readTemplate("scripts/task.py");
 export const getContextScript = readTemplate("scripts/get_context.py");
 export const addSessionScript = readTemplate("scripts/add_session.py");
-export const subnodeArtifactScript = readTemplate("scripts/subnode_artifact.py");
-export const workspaceNoteScript = readTemplate("scripts/workspace_note.py");
 // Configuration files
 export const workflowMdTemplate = readTemplate("workflow.md");
 export const configYamlTemplate = readTemplate("config.yaml");
 export const gitignoreTemplate = readTemplate("gitignore.txt");
 export const gitattributesTemplate = readTemplate("gitattributes.txt");
-// Channel runtime agent definitions (loaded by
-// `packages/cli/src/commands/channel/agent-loader.ts` from `.trellis/agents/`).
-// These are platform-agnostic Trellis runtime files dispatched at `trellis init`
-// and refreshed by `trellis update`.
-export const implementAgentTemplate = readTemplate("agents/implement.md");
-export const checkAgentTemplate = readTemplate("agents/check.md");
-export const subnodeAgentTemplate = readTemplate("agents/subnode.md");
-export const subnodeEnvTemplate = readTemplate("agents/subnode.env");
+// Project agent roles loaded from `.trellis/agents/`.
+export const teammateAgentTemplate = readTemplate("agents/teammate.md");
+export const delegatedWorktreeAgentTemplate = readTemplate("agents/delegated-worktree-primary-agent.md");
+export const teammateProfilesTemplate = readTemplate("agents/teammate-profiles.json");
 /**
  * Get all script templates as a map of relative path to content
  */
@@ -100,11 +93,10 @@ export function getAllScripts() {
     scripts.set("common/types.py", commonTypes);
     scripts.set("common/tasks.py", commonTasks);
     scripts.set("common/task_context.py", commonTaskContext);
-    scripts.set("common/context_projection.py", commonContextProjection);
     scripts.set("common/task_store.py", commonTaskStore);
+    scripts.set("common/task_workflow.py", commonTaskWorkflow);
+    scripts.set("common/task_continuity.py", commonTaskContinuity);
     scripts.set("common/session_context.py", commonSessionContext);
-    scripts.set("common/continuation_record.py", commonContinuationRecord);
-    scripts.set("common/ownership_record.py", commonOwnershipRecord);
     scripts.set("common/packages_context.py", commonPackagesContext);
     scripts.set("common/workflow_phase.py", commonWorkflowPhase);
     scripts.set("common/workflow_selection.py", commonWorkflowSelection);
@@ -118,12 +110,10 @@ export function getAllScripts() {
     scripts.set("task.py", taskScript);
     scripts.set("get_context.py", getContextScript);
     scripts.set("add_session.py", addSessionScript);
-    scripts.set("subnode_artifact.py", subnodeArtifactScript);
-    scripts.set("workspace_note.py", workspaceNoteScript);
     return scripts;
 }
 /**
- * Get all channel runtime agent assets as a map of relative path
+ * Get project agent role assets as a map of relative path
  * (under `.trellis/agents/`) to content.
  *
  * Consumed by `trellis init` (to dispatch on first install) and by
@@ -132,10 +122,9 @@ export function getAllScripts() {
  */
 export function getAllAgents() {
     const agents = new Map();
-    agents.set("implement.md", implementAgentTemplate);
-    agents.set("check.md", checkAgentTemplate);
-    agents.set("subnode.md", subnodeAgentTemplate);
-    agents.set("subnode.env", subnodeEnvTemplate);
+    agents.set("teammate.md", teammateAgentTemplate);
+    agents.set("delegated-worktree-primary-agent.md", delegatedWorktreeAgentTemplate);
+    agents.set("teammate-profiles.json", teammateProfilesTemplate);
     return agents;
 }
 //# sourceMappingURL=index.js.map

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/add_session.py

@@ -1107,7 +1107,7 @@ def _auto_commit_workspace(repo_root: Path) -> str:
 
     commit_msg = get_session_commit_message(repo_root)
     # Resolve the current task so staging is scoped to its dir only. The ref
-    # is ``.trellis/tasks/<name>`` (or under archive/) — pass the bare name.
+    # is ``.trellis/tasks/<name>`` — pass the bare task name.
     current = get_current_task(repo_root)
     if current:
         task_name = Path(current).name

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

@@ -59,7 +59,6 @@ from .paths import (
     DIR_WORKFLOW,
     DIR_WORKSPACE,
     DIR_TASKS,
-    DIR_ARCHIVE,
     DIR_SPEC,
     DIR_SCRIPTS,
     FILE_DEVELOPER,

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

@@ -2,12 +2,13 @@
 """Session-scoped active task resolution.
 
 The user-facing concept is a single "active task". Trellis stores that pointer
-per AI session/window under `.trellis/.runtime/sessions/`; when the pointer is
-missing, a unique developer-owned resumable task may be exposed read-only.
+per AI session/window under `.trellis/.runtime/sessions/`; without a stable
+session key there is no active task.
 """
 
 from __future__ import annotations
 
+import contextlib
 import hashlib
 import os
 import re
@@ -18,7 +19,7 @@ from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any
 
-from .io import read_json as _io_read_json, write_json as _io_write_json
+from .io import JSON_READ_MISSING, read_json as _io_read_json, read_json_checked, write_json as _io_write_json
 
 DIR_WORKFLOW = ".trellis"
 DIR_TASKS = "tasks"
@@ -33,7 +34,7 @@ DIR_SHELL_TICKETS = "shell-tickets"
 # platform that works today.
 DIR_LEGACY_CURSOR_SHELL_TICKETS = "cursor-shell"
 SHELL_TICKET_TTL_SECONDS = 30
-TASK_SESSION_COMMANDS = {"start", "replan", "current", "finish"}
+TASK_SESSION_COMMANDS = {"start", "current", "finish"}
 
 _SESSION_KEYS = ("session_id", "sessionId", "sessionID")
 _CONVERSATION_KEYS = ("conversation_id", "conversationId", "conversationID")
@@ -168,7 +169,6 @@ class ActiveTask:
     source_type: str
     context_key: str | None = None
     stale: bool = False
-    candidate_paths: tuple[str, ...] = ()
 
     @property
     def source(self) -> str:
@@ -425,7 +425,7 @@ def _pending_ticket_matches_args(ticket: dict[str, Any], repo_root: Path) -> boo
             continue
         if _string_value(subcommand.get("name")) != command_name:
             continue
-        if command_name not in {"start", "replan"}:
+        if command_name != "start":
             return True
         task_ref = args[1] if len(args) > 1 else None
         if _task_refs_match(_string_value(subcommand.get("task_ref")), task_ref, repo_root):
@@ -666,6 +666,36 @@ def _context_path(repo_root: Path, context_key: str) -> Path:
     return _runtime_sessions_dir(repo_root) / f"{context_key}.json"
 
 
+@contextlib.contextmanager
+def _session_file_lock(context_path: Path):
+    """Serialize changes to one session's active-task pointer."""
+    lock_path = context_path.with_suffix(".lock")
+    lock_path.parent.mkdir(parents=True, exist_ok=True)
+    with lock_path.open("a+b") as handle:
+        if os.name == "nt":
+            import msvcrt
+
+            handle.seek(0)
+            if handle.read(1) == b"":
+                handle.write(b"\0")
+                handle.flush()
+            handle.seek(0)
+            msvcrt.locking(handle.fileno(), msvcrt.LK_LOCK, 1)
+            try:
+                yield
+            finally:
+                handle.seek(0)
+                msvcrt.locking(handle.fileno(), msvcrt.LK_UNLCK, 1)
+        else:
+            import fcntl
+
+            fcntl.flock(handle.fileno(), fcntl.LOCK_EX)
+            try:
+                yield
+            finally:
+                fcntl.flock(handle.fileno(), fcntl.LOCK_UN)
+
+
 def resolve_active_task(
     repo_root: Path,
     platform_input: dict[str, Any] | None = None,
@@ -676,12 +706,10 @@ def resolve_active_task(
 ) -> ActiveTask:
     """Resolve the active task from session runtime state only.
 
-    A stale session task is returned as stale. Missing or unmatched session
-    identity does not infer ownership from the number of session files.
-    A unique developer-owned task, or an explicit ambiguous projection, may
-    still be exposed without writing a binding. Only the legacy inference from
-    one unrelated session file is opt-in; pull-based child agents use that
-    compatibility opt-in when they cannot inherit a parent session identity.
+    A stale session task is returned as stale. Missing context identity or a
+    Missing or unmatched session identity does not infer ownership from the
+    number of session files. Pull-based child-agent callers that cannot inherit
+    a parent identity must opt into the compatibility fallback explicitly.
     """
     context_key = resolve_context_key(
         platform_input,
@@ -694,20 +722,12 @@ def resolve_active_task(
         active = _active_from_ref(task_ref, repo_root, "session", context_key)
         if active:
             return active
-        unbound = _resolve_unbound_task(repo_root)
-        if unbound is not None:
-            return unbound
-        return ActiveTask(None, "none", context_key)
 
     if allow_single_session_fallback:
         fallback = _resolve_single_session_fallback(repo_root)
         if fallback is not None:
             return fallback
 
-    unbound = _resolve_unbound_task(repo_root)
-    if unbound is not None:
-        return unbound
-
     return ActiveTask(None, "none", context_key)
 
 
@@ -736,38 +756,6 @@ def _resolve_single_session_fallback(repo_root: Path) -> ActiveTask | None:
     return _active_from_ref(task_ref, repo_root, "session-fallback", fallback_key)
 
 
-def _resolve_unbound_task(repo_root: Path) -> ActiveTask | None:
-    """Expose one developer-owned task when no session pointer exists."""
-    sessions_dir = _runtime_sessions_dir(repo_root)
-    if sessions_dir.is_dir():
-        session_files = sorted(sessions_dir.glob("*.json"))
-        if any(_string_value((_read_json(session) or {}).get("current_task")) for session in session_files):
-            return None
-
-    from .paths import get_developer, get_tasks_dir
-    from .tasks import iter_active_tasks
-
-    developer = get_developer(repo_root)
-    if not developer:
-        return None
-
-    candidates = [
-        task
-        for task in iter_active_tasks(get_tasks_dir(repo_root))
-        if task.assignee == developer and task.status in {"planning", "in_progress", "review"}
-    ]
-    if len(candidates) == 0:
-        return None
-
-    task_paths = tuple(sorted(
-        task.directory.relative_to(repo_root).as_posix()
-        for task in candidates
-    ))
-    if len(task_paths) == 1:
-        return ActiveTask(task_paths[0], "unbound", None)
-    return ActiveTask(None, "unbound_ambiguous", None, candidate_paths=task_paths)
-
-
 def _utc_now() -> str:
     return datetime.now(timezone.utc).replace(microsecond=0).isoformat().replace("+00:00", "Z")
 
@@ -814,15 +802,71 @@ def set_active_task(
         return None
 
     context_path = _context_path(repo_root, context_key)
-    context = _read_json(context_path) or {}
-    context.update(_context_metadata(platform_input, platform, context_key))
-    context["current_task"] = canonical
-    context.setdefault("current_run", None)
-    if not _write_json(context_path, context):
-        return None
+    from .task_continuity import active_task_change_guard
+
+    with active_task_change_guard(repo_root, context_key, canonical, clearing=False) as allowed:
+        if not allowed:
+            return None
+        with _session_file_lock(context_path):
+            context = _read_json(context_path) or {}
+            context.update(_context_metadata(platform_input, platform, context_key))
+            context["current_task"] = canonical
+            context.setdefault("current_run", None)
+            if not _write_json(context_path, context):
+                return None
     return ActiveTask(canonical, "session", context_key)
 
 
+def compare_and_set_active_task(
+    repo_root: Path,
+    context_key: str,
+    expected_task: str | None,
+    task_path: str | None,
+) -> bool:
+    """Change one direct session pointer only when its current value matches."""
+    context_path = _context_path(repo_root, context_key)
+    with _session_file_lock(context_path):
+        context, reason = read_json_checked(context_path)
+        if context is None and reason == JSON_READ_MISSING:
+            if expected_task is not None or task_path is None:
+                return False
+            context = {}
+        elif context is None:
+            return False
+        current = _string_value(context.get("current_task"))
+        current_ref = _canonical_task_ref(current, repo_root) if current else None
+        expected_ref = _canonical_task_ref(expected_task, repo_root) if expected_task else None
+        if current_ref != expected_ref:
+            return False
+        if task_path is None:
+            context.pop("current_task", None)
+        else:
+            canonical = _canonical_task_ref(task_path, repo_root)
+            if canonical is None:
+                return False
+            context["current_task"] = canonical
+            context.setdefault("current_run", None)
+        return _write_json(context_path, context)
+
+
+def clear_active_task_if_matches(repo_root: Path, context_key: str, expected_task: str) -> bool:
+    """Clear one session pointer when it still references the expected task."""
+    context_path = _context_path(repo_root, context_key)
+    with _session_file_lock(context_path):
+        context, reason = read_json_checked(context_path)
+        if context is None:
+            return reason == JSON_READ_MISSING
+        if not isinstance(context, dict):
+            return False
+        current = _string_value(context.get("current_task"))
+        current_ref = _canonical_task_ref(current, repo_root) if current else None
+        expected_ref = _canonical_task_ref(expected_task, repo_root)
+        if current_ref != expected_ref:
+            return True
+        context.pop("current_task", None)
+        return _write_json(context_path, context)
+
+
 def clear_active_task(
     repo_root: Path,
     platform_input: dict[str, Any] | None = None,
@@ -838,27 +882,17 @@ def clear_active_task(
         return previous
 
     context_path = _context_path(repo_root, previous.context_key)
-    if context_path.is_file():
-        _remove_file(context_path)
+    from .task_continuity import active_task_change_guard
+
+    with active_task_change_guard(repo_root, previous.context_key, previous.task_path, clearing=True) as allowed:
+        if not allowed:
+            return ActiveTask(previous.task_path, "session", previous.context_key)
+        with _session_file_lock(context_path):
+            if context_path.is_file():
+                _remove_file(context_path)
     return previous
 
 
-def clear_active_task_for_context(
-    context_key: str,
-    task_path: str,
-    repo_root: Path,
-) -> str:
-    """Clear one exact session pointer, refusing an unexpected replacement."""
-    context_path = _context_path(repo_root, context_key)
-    context = _read_json(context_path)
-    if context is None or not _string_value(context.get("current_task")):
-        return "absent"
-    current = _string_value(context.get("current_task"))
-    if not _task_refs_match(current, task_path, repo_root):
-        return "changed"
-    return "cleared" if context_path.is_file() and _remove_file(context_path) else "absent"
-
-
 def clear_task_from_sessions(task_path: str, repo_root: Path) -> int:
     """Delete all session runtime files that point at a task."""
     target = _canonical_task_ref(task_path, repo_root) or normalize_task_ref(task_path)
@@ -871,15 +905,16 @@ def clear_task_from_sessions(task_path: str, repo_root: Path) -> int:
         return cleared
 
     for session_path in sessions_dir.glob("*.json"):
-        context = _read_json(session_path) or {}
-        current = _string_value(context.get("current_task"))
-        if not current:
-            continue
-        current_ref = _canonical_task_ref(current, repo_root) or normalize_task_ref(current)
-        if current_ref != target:
-            continue
-        if session_path.is_file() and _remove_file(session_path):
-            cleared += 1
+        with _session_file_lock(session_path):
+            context = _read_json(session_path) or {}
+            current = _string_value(context.get("current_task"))
+            if not current:
+                continue
+            current_ref = _canonical_task_ref(current, repo_root) or normalize_task_ref(current)
+            if current_ref != target:
+                continue
+            if session_path.is_file() and _remove_file(session_path):
+                cleared += 1
 
     return cleared
 
@@ -888,7 +923,7 @@ def repoint_task_in_sessions(old_path: str, new_path: str, repo_root: Path) -> i
     """Move every session pointer from `old_path` to `new_path`.
 
     Rename is the one lifecycle step where the task survives under a different
-    name, so clearing the pointers (what archive does) would be wrong: the user
+    name, so clearing the pointers would be wrong: the user
     would silently lose their active task and have to run `task.py start`
     again to get context injection back. Repointing keeps the session valid
     across the rename.
@@ -908,20 +943,21 @@ def repoint_task_in_sessions(old_path: str, new_path: str, repo_root: Path) -> i
         return moved
 
     for session_path in sorted(sessions_dir.glob("*.json")):
-        context = _read_json(session_path)
-        if not context:
-            continue
-        current = _string_value(context.get("current_task"))
-        if not current:
-            continue
-        current_ref = _canonical_task_ref(current, repo_root) or _relative_task_ref(
-            current, repo_root
-        )
-        if current_ref != target:
-            continue
-        context["current_task"] = replacement
-        if _write_json(session_path, context):
-            moved += 1
+        with _session_file_lock(session_path):
+            context = _read_json(session_path)
+            if not context:
+                continue
+            current = _string_value(context.get("current_task"))
+            if not current:
+                continue
+            current_ref = _canonical_task_ref(current, repo_root) or _relative_task_ref(
+                current, repo_root
+            )
+            if current_ref != target:
+                continue
+            context["current_task"] = replacement
+            if _write_json(session_path, context):
+                moved += 1
 
     return moved
 

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

@@ -22,7 +22,7 @@ from .trellis_config import parse_simple_yaml
 DEFAULT_SESSION_COMMIT_MESSAGE = "chore: record journal"
 DEFAULT_MAX_JOURNAL_LINES = 2000
 DEFAULT_SESSION_AUTO_COMMIT = True
-DEFAULT_CODEX_DISPATCH_MODE = "inline"
+DEFAULT_CODEX_DISPATCH_MODE = "auto"
 
 CONFIG_FILE = "config.yaml"
 
@@ -118,12 +118,11 @@ def get_max_journal_lines(repo_root: Path | None = None) -> int:
 def get_session_auto_commit(repo_root: Path | None = None) -> bool:
     """Whether scripts should auto-stage + auto-commit session/task changes.
 
-    Governs both ``add_session.py:_auto_commit_workspace`` and
-    ``task_store.py:_auto_commit_archive``.
+    Governs ``add_session.py:_auto_commit_workspace``.
 
     Default: ``True`` (existing behavior — auto-stage + auto-commit).
     Set ``session_auto_commit: false`` in ``.trellis/config.yaml`` to skip
-    auto-staging entirely; the journal/archive files are still written to
+    auto-staging entirely; journal files are still written to
     disk, but the user manages ``git add`` / ``git commit`` themselves.
 
     Accepts native YAML booleans (``true`` / ``false``) and the string
@@ -140,10 +139,9 @@ def get_session_auto_commit(repo_root: Path | None = None) -> bool:
 def get_codex_dispatch_mode(repo_root: Path | None = None) -> str:
     """Return Codex dispatch mode.
 
-    Default is ``inline``: the main session carries out implementation and
-    verification directly. ``auto`` explicitly enables Trellis sub-agents and
-    native context injection with a child-side fallback. ``sub-agent`` remains
-    a backwards-compatible alias for ``auto``.
+    Default is ``auto``, which dispatches Trellis sub-agents and uses native
+    context injection with a child-side fallback. ``inline`` is an explicit
+    opt-out. ``sub-agent`` remains a backwards-compatible alias for ``auto``.
 
     Invalid explicit configuration falls back to ``inline`` rather than
     unexpectedly dispatching a sub-agent. This CLI-facing parser is the only
@@ -282,7 +280,7 @@ def get_hooks(event: str, repo_root: Path | None = None) -> list[str]:
     """Get hook commands for a lifecycle event.
 
     Args:
-        event: Event name (e.g. "after_create", "after_archive").
+        event: Event name (e.g. "after_create", "after_complete").
         repo_root: Repository root path.
 
     A hook the user believes is installed and which silently never runs is the

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

@@ -65,7 +65,7 @@ def main() -> None:
     )
     parser.add_argument(
         "--step",
-        help="Step id for --mode phase, e.g. 1.1, 2.2. Omit to get the Phase Index.",
+        help="Legacy workflow step id. Omit to get the Phase Index and load the active phase Skill.",
     )
     parser.add_argument(
         "--platform",

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

@@ -10,6 +10,7 @@ from __future__ import annotations
 
 import json
 import os
+import sys
 import tempfile
 from pathlib import Path
 
@@ -114,6 +115,24 @@ def write_json(path: Path, data: dict) -> bool:
 
     Returns True on success, False on error.
     """
+    if path.name == "task.json" and path.is_file():
+        workflow_dir = next((parent for parent in path.parents if parent.name == ".trellis"), None)
+        if workflow_dir is not None:
+            repo_root = workflow_dir.parent
+            from .task_utils import is_within_tasks_dir
+
+            if is_within_tasks_dir(path.parent, repo_root):
+                current, _ = read_json_checked(path)
+                if current is None:
+                    print("TASK_TRANSFER_WITHHELD: task.json cannot be checked before writing", file=sys.stderr)
+                    return False
+                from .task_continuity import task_mutation_guard
+
+                with task_mutation_guard(repo_root, path.parent, current) as allowed:
+                    if not allowed:
+                        print("TASK_TRANSFER_ACTIVE: task changes are fenced until ownership is consumed or released", file=sys.stderr)
+                        return False
+                    return write_text_atomic(path, json.dumps(data, indent=2, ensure_ascii=False))
     return write_text_atomic(path, json.dumps(data, indent=2, ensure_ascii=False))
 
 

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

@@ -28,7 +28,6 @@ from .git import main_worktree_root
 DIR_WORKFLOW = ".trellis"
 DIR_WORKSPACE = "workspace"
 DIR_TASKS = "tasks"
-DIR_ARCHIVE = "archive"
 DIR_SPEC = "spec"
 DIR_SCRIPTS = "scripts"