feat: v0.4.0-beta — statusLine integration + docs fixes

.claude/hooks/statusline.py

@@ -0,0 +1,182 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Trellis StatusLine — project-level status display for Claude Code.
+
+Reads Claude Code session JSON from stdin + Trellis task data from filesystem.
+Outputs 1-2 lines:
+  With active task:  [P1] Task title (status)  +  info line
+  Without task:      info line only
+Info line: model · ctx% · branch · duration · developer · tasks · rate limits
+"""
+from __future__ import annotations
+
+import json
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+
+def _read_text(path: Path) -> str:
+    try:
+        return path.read_text(encoding="utf-8").strip()
+    except (FileNotFoundError, PermissionError, OSError):
+        return ""
+
+
+def _read_json(path: Path) -> dict:
+    text = _read_text(path)
+    if not text:
+        return {}
+    try:
+        return json.loads(text)
+    except (json.JSONDecodeError, ValueError):
+        return {}
+
+
+def _find_trellis_dir() -> Path | None:
+    """Walk up from cwd to find .trellis/ directory."""
+    current = Path.cwd()
+    for parent in [current, *current.parents]:
+        candidate = parent / ".trellis"
+        if candidate.is_dir():
+            return candidate
+    return None
+
+
+def _get_current_task(trellis_dir: Path) -> dict | None:
+    """Load current task info. Returns dict with title/status/priority or None."""
+    task_ref = _read_text(trellis_dir / ".current-task")
+    if not task_ref:
+        return None
+
+    # Resolve task directory
+    task_path = Path(task_ref) if Path(task_ref).is_absolute() else trellis_dir.parent / task_ref
+    task_data = _read_json(task_path / "task.json")
+    if not task_data:
+        return None
+
+    return {
+        "title": task_data.get("title") or task_data.get("name") or "unknown",
+        "status": task_data.get("status", "unknown"),
+        "priority": task_data.get("priority", "P2"),
+    }
+
+
+def _count_active_tasks(trellis_dir: Path) -> int:
+    """Count non-archived task directories with valid task.json."""
+    tasks_dir = trellis_dir / "tasks"
+    if not tasks_dir.is_dir():
+        return 0
+    count = 0
+    for d in tasks_dir.iterdir():
+        if d.is_dir() and d.name != "archive" and (d / "task.json").is_file():
+            count += 1
+    return count
+
+
+def _get_developer(trellis_dir: Path) -> str:
+    content = _read_text(trellis_dir / ".developer")
+    if not content:
+        return "unknown"
+    for line in content.splitlines():
+        if line.startswith("name="):
+            return line[5:].strip()
+    return content.splitlines()[0].strip() or "unknown"
+
+
+def _get_git_branch() -> str:
+    try:
+        result = subprocess.run(
+            ["git", "branch", "--show-current"],
+            capture_output=True, text=True, timeout=3,
+        )
+        return result.stdout.strip() if result.returncode == 0 else ""
+    except (FileNotFoundError, subprocess.TimeoutExpired):
+        return ""
+
+
+def _format_ctx_size(size: int) -> str:
+    if size >= 1_000_000:
+        return f"{size // 1_000_000}M"
+    if size >= 1_000:
+        return f"{size // 1_000}K"
+    return str(size)
+
+
+def _format_duration(ms: int) -> str:
+    secs = ms // 1000
+    hours, remainder = divmod(secs, 3600)
+    mins = remainder // 60
+    if hours > 0:
+        return f"{hours}h{mins}m"
+    return f"{mins}m"
+
+
+def main() -> None:
+    # Read Claude Code session JSON from stdin
+    try:
+        cc_data = json.loads(sys.stdin.read())
+    except (json.JSONDecodeError, ValueError):
+        cc_data = {}
+
+    trellis_dir = _find_trellis_dir()
+    SEP = " \033[90m·\033[0m "
+
+    # --- Trellis data ---
+    task = _get_current_task(trellis_dir) if trellis_dir else None
+    dev = _get_developer(trellis_dir) if trellis_dir else ""
+    task_count = _count_active_tasks(trellis_dir) if trellis_dir else 0
+
+    # --- CC session data ---
+    model = cc_data.get("model", {}).get("display_name", "?")
+    ctx_pct = int(cc_data.get("context_window", {}).get("used_percentage") or 0)
+    ctx_size = _format_ctx_size(cc_data.get("context_window", {}).get("context_window_size") or 0)
+    duration = _format_duration(cc_data.get("cost", {}).get("total_duration_ms") or 0)
+    branch = _get_git_branch()
+
+    # Avoid "Opus 4.6 (1M context) (1M)"
+    if re.search(r"\d+[KMG]\b", model, re.IGNORECASE):
+        model_label = model
+    else:
+        model_label = f"{model} ({ctx_size})"
+
+    # Context % with color
+    if ctx_pct >= 90:
+        ctx_color = "\033[31m"
+    elif ctx_pct >= 70:
+        ctx_color = "\033[33m"
+    else:
+        ctx_color = "\033[32m"
+
+    # Build info line: model · ctx · branch · duration · dev · tasks [· rate limits]
+    parts = [
+        model_label,
+        f"ctx {ctx_color}{ctx_pct}%\033[0m",
+    ]
+    if branch:
+        parts.append(f"\033[35m{branch}\033[0m")
+    parts.append(duration)
+    if dev:
+        parts.append(f"\033[32m{dev}\033[0m")
+    if task_count:
+        parts.append(f"{task_count} task(s)")
+
+    five_hr = cc_data.get("rate_limits", {}).get("five_hour", {}).get("used_percentage")
+    if five_hr is not None:
+        parts.append(f"5h {int(five_hr)}%")
+    seven_day = cc_data.get("rate_limits", {}).get("seven_day", {}).get("used_percentage")
+    if seven_day is not None:
+        parts.append(f"7d {int(seven_day)}%")
+
+    info_line = SEP.join(parts)
+
+    # Output: task line (only if active) + info line
+    if task:
+        print(f"\033[36m[{task['priority']}]\033[0m {task['title']} \033[33m({task['status']})\033[0m")
+    print(info_line)
+
+
+if __name__ == "__main__":
+    main()

.claude/settings.json

@@ -1,4 +1,8 @@
 {
+  "statusLine": {
+    "type": "command",
+    "command": "python3 .claude/hooks/statusline.py"
+  },
   "hooks": {
     "SessionStart": [
       {

.codex/config.toml

@@ -1,5 +1,5 @@
 # Project-scoped Codex defaults for Trellis workflows.
-# Codex loads this after ~/.codex/config.toml when you work in this repository.
+# Codex loads this after ~/.codex/config.toml when you work in this project.
 
 # Keep AGENTS.md as the primary project instruction file.
 project_doc_fallback_filenames = ["AGENTS.md"]

.trellis/.template-hashes.json

@@ -77,5 +77,6 @@
   ".agents/skills/onboard/SKILL.md": "ec6db142f763c81a3273be45b5d7726f695c32aaa5404e90dbd6e40aec92fb98",
   ".agents/skills/record-session/SKILL.md": "2f3781d894b7a45b517d36845fa18e6fac98acad40e77438a3d85760f1d7d247",
   ".agents/skills/start/SKILL.md": "8853e4ddc1681e043dec34be76c7c6fd961a3d52cbd0a2320225d72440425639",
-  ".agents/skills/update-spec/SKILL.md": "7ccf7d29ea26d28b0bd8af94ea5b8bfcddaddd9f2797f3becedbe5f3a0a9e9a7"
+  ".agents/skills/update-spec/SKILL.md": "7ccf7d29ea26d28b0bd8af94ea5b8bfcddaddd9f2797f3becedbe5f3a0a9e9a7",
+  ".codex/config.toml": "7543da7e1773a0f26bc9178716b34154fdc5fefd820fb184e7cb169f1910cc99"
 }

.trellis/.version

@@ -1 +1 @@
-0.4.0-beta.7
+0.4.0-beta.8

.trellis/tasks/03-24-py39-compat/prd.md

@@ -0,0 +1,35 @@
+# fix: Python 3.9 compatibility — add future annotations
+
+## Goal
+
+Fix Python 3.9 compatibility issue (#113). Trellis Python scripts use `X | Y` union type syntax (PEP 604, Python 3.10+), causing runtime errors on Python 3.9.
+
+## Requirements
+
+- Add `from __future__ import annotations` to all 21 affected Python files in `.trellis/scripts/`
+- Add the same to all corresponding template copies in `packages/cli/src/templates/trellis/scripts/`
+- Verify both copies remain identical after changes
+- Consider adding Python version check during `trellis init`
+
+## Affected Files (21)
+
+- add_session.py
+- common/cli_adapter.py, config.py, developer.py, git.py, io.py
+- common/packages_context.py, paths.py, registry.py, session_context.py
+- common/task_context.py, task_queue.py, task_store.py, task_utils.py, tasks.py, types.py, worktree.py
+- hooks/linear_sync.py
+- multi_agent/create_pr.py, status_display.py, status_monitor.py
+
+## Acceptance Criteria
+
+- [ ] All scripts work on Python 3.9+
+- [ ] `from __future__ import annotations` added to all affected files
+- [ ] Template copies identical to live scripts
+- [ ] `pnpm test` passes
+- [ ] No `tuple[...]` runtime usage (only in annotations)
+
+## Technical Notes
+
+- `from __future__ import annotations` makes all annotations strings (PEP 563), so `X | Y` works on 3.9
+- Must check for runtime type usage like `isinstance(x, str | int)` — those need `Union[str, int]` instead
+- GitHub issue: #113

.trellis/tasks/03-24-py39-compat/task.json

@@ -0,0 +1,47 @@
+{
+  "id": "py39-compat",
+  "name": "py39-compat",
+  "title": "fix: Python 3.9 compatibility — add future annotations",
+  "description": "",
+  "status": "planning",
+  "dev_type": null,
+  "scope": null,
+  "package": "cli",
+  "priority": "P2",
+  "creator": "taosu",
+  "assignee": "taosu",
+  "createdAt": "2026-03-24",
+  "completedAt": null,
+  "branch": null,
+  "base_branch": "feat/v0.4.0-beta",
+  "worktree_path": null,
+  "current_phase": 0,
+  "next_action": [
+    {
+      "phase": 1,
+      "action": "implement"
+    },
+    {
+      "phase": 2,
+      "action": "check"
+    },
+    {
+      "phase": 3,
+      "action": "finish"
+    },
+    {
+      "phase": 4,
+      "action": "create-pr"
+    }
+  ],
+  "commit": null,
+  "pr_url": null,
+  "subtasks": [],
+  "children": [],
+  "parent": null,
+  "relatedFiles": [],
+  "notes": "",
+  "meta": {
+    "linear_issue": "MIN-415"
+  }
+}

.trellis/tasks/archive/2026-03/03-26-statusline-integration/task.json

@@ -0,0 +1,47 @@
+{
+  "id": "statusline-integration",
+  "name": "statusline-integration",
+  "title": "StatusLine: 集成 Trellis 任务状态到 Claude Code 状态栏",
+  "description": "",
+  "status": "completed",
+  "dev_type": null,
+  "scope": null,
+  "package": "cli",
+  "priority": "P2",
+  "creator": "taosu",
+  "assignee": "taosu",
+  "createdAt": "2026-03-26",
+  "completedAt": "2026-03-26",
+  "branch": null,
+  "base_branch": "feat/v0.4.0-beta",
+  "worktree_path": null,
+  "current_phase": 0,
+  "next_action": [
+    {
+      "phase": 1,
+      "action": "implement"
+    },
+    {
+      "phase": 2,
+      "action": "check"
+    },
+    {
+      "phase": 3,
+      "action": "finish"
+    },
+    {
+      "phase": 4,
+      "action": "create-pr"
+    }
+  ],
+  "commit": null,
+  "pr_url": null,
+  "subtasks": [],
+  "children": [],
+  "parent": null,
+  "relatedFiles": [],
+  "notes": "",
+  "meta": {
+    "linear_issue": "MIN-416"
+  }
+}

.trellis/workspace/taosu/index.md

@@ -8,8 +8,8 @@
 
 <!-- @@@auto:current-status -->
 - **Active File**: `journal-4.md`
-- **Total Sessions**: 104
-- **Last Active**: 2026-03-24
+- **Total Sessions**: 105
+- **Last Active**: 2026-03-26
 <!-- @@@/auto:current-status -->
 
 ---
@@ -19,7 +19,7 @@
 <!-- @@@auto:active-documents -->
 | File | Lines | Status |
 |------|-------|--------|
-| `journal-4.md` | ~153 | Active |
+| `journal-4.md` | ~187 | Active |
 | `journal-3.md` | ~1988 | Archived |
 | `journal-2.md` | ~1963 | Archived |
 | `journal-1.md` | ~1998 | Archived |
@@ -32,6 +32,7 @@
 <!-- @@@auto:session-history -->
 | # | Date | Title | Commits | Branch |
 |---|------|-------|---------|--------|
+| 105 | 2026-03-26 | StatusLine: 集成 Trellis 任务状态到 CC 状态栏 | `9e4411c` | `feat/v0.4.0-beta` |
 | 104 | 2026-03-24 | Decouple .agents/skills as shared layer + Codex .codex support | `ba75c30` | `feat/v0.4.0-beta` |
 | 103 | 2026-03-16 | Rename empty templates to from scratch | `57a243d` |
 | 102 | 2026-03-13 | Publish-Skill Command & Docs-Site Sync | `d8d7dfb`, `b93ef30` |