pygittools 0.2.1__tar.gz → 0.2.2__tar.gz

{pygittools-0.2.1 → pygittools-0.2.2}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: pygittools
-Version: 0.2.1
+Version: 0.2.2
 Summary: Hooks and task storage in Git
 License-Expression: MIT
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mcp>=1.28.0
 Requires-Dist: pygit2>=1.12.0
 Requires-Dist: uni-curses>=3.1.2
 Dynamic: license-file

{pygittools-0.2.1 → pygittools-0.2.2}/hook_samples/README.md

@@ -30,6 +30,24 @@ Environment variables:
 - `PYGITWEB_COMMIT_MSG_PATTERN` — message regex (default `^(\S+): (.+)`)
 - `PYGITWEB_REJECT_MERGE_COMMITS` — set to `1`/`true`/`yes` to reject merge commits
 
+## pre-receive.branch-permissions
+
+Enforce per-branch write permissions based on `auth.json` `oauth_permissions`. For each
+updated branch ref (`refs/heads/*`), the hook:
+
+- Builds a `project/branch` subject (e.g. `demo/main`, `demo/dev/alice.feature`).
+- If any `pgw.write_branch.{scope}` keys match that subject, requires a matching grant.
+- Otherwise, falls back to project write (`pgw.write.{project}`) for that project.
+
+When no usable configuration or context is available, the hook is a no-op and allows
+the push to proceed.
+
+Environment variables:
+
+- `PYGITWEB_PRINCIPAL` — principal identity string (email or username) to check grants for.
+- `PYGITWEB_PROJECT` — project path as known to pygitweb (e.g. `demo`, `team/app`).
+- `PYGITWEB_AUTH_CONFIG` — optional auth.json path (default: `~/.pygitweb/auth.json`).
+
 ## post-commit.push-remotes
 
 After each local commit, force-with-lease push the current branch to every configured

pygittools-0.2.2/hook_samples/pre-receive.branch-permissions

@@ -0,0 +1,69 @@
+#!/usr/bin/env -S uv run python
+
+from __future__ import annotations
+
+__VERSION__ = "1"
+
+import os
+import sys
+from pathlib import Path
+
+from pygittools.hooks import HookResult, RefUpdate, parse_ref_updates
+from pygitweb.auth_config import DEFAULT_AUTH_CONFIG_PATH, AuthConfig
+from pygitweb.permissions import PermissionsMap, has_branch_write_permission
+
+
+def _normalize_env(name: str) -> str | None:
+	value = os.environ.get(name)
+	if value is None:
+		return None
+	stripped = value.strip()
+	return stripped or None
+
+
+def _load_permissions() -> PermissionsMap | None:
+	config_path_env = _normalize_env("PYGITWEB_AUTH_CONFIG")
+	path = Path(config_path_env).expanduser() if config_path_env is not None else DEFAULT_AUTH_CONFIG_PATH
+	try:
+		text = path.read_text(encoding="utf-8")
+	except OSError:
+		return None
+	try:
+		config = AuthConfig.model_validate_json(text)
+	except Exception:
+		return None
+	return config.oauth_permissions
+
+
+def _check_updates(
+	principal: str,
+	project: str,
+	updates: list[RefUpdate],
+	permissions: PermissionsMap,
+) -> HookResult:
+	for _, _, ref_name in updates:
+		if has_branch_write_permission(permissions, principal, project, ref_name):
+			continue
+		sys.stderr.write(
+			f"Push rejected: {principal!r} lacks branch write permission for project {project!r} ref {ref_name!r}.\n",
+		)
+		return HookResult.FAILURE
+	return HookResult.SUCCESS
+
+
+def main() -> int:
+	principal = _normalize_env("PYGITWEB_PRINCIPAL")
+	project = _normalize_env("PYGITWEB_PROJECT")
+	if principal is None or project is None:
+		return int(HookResult.SUCCESS.value)
+	permissions = _load_permissions()
+	if permissions is None:
+		return int(HookResult.SUCCESS.value)
+	updates = parse_ref_updates(sys.stdin)
+	result = _check_updates(principal, project, updates, permissions)
+	return int(result.value)
+
+
+if __name__ == "__main__":
+	raise SystemExit(main())
+

pygittools-0.2.2/mcp_server.py

@@ -0,0 +1,8 @@
+"""Compatibility shim for the MCP server.
+
+Use the dedicated ``pygittools-mcp`` package for the actual implementation.
+"""
+
+from __future__ import annotations
+
+from pygittools_mcp.mcp_server import *  # noqa: F401,F403

{pygittools-0.2.1 → pygittools-0.2.2}/pygittools.egg-info/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: pygittools
-Version: 0.2.1
+Version: 0.2.2
 Summary: Hooks and task storage in Git
 License-Expression: MIT
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mcp>=1.28.0
 Requires-Dist: pygit2>=1.12.0
 Requires-Dist: uni-curses>=3.1.2
 Dynamic: license-file

{pygittools-0.2.1 → pygittools-0.2.2}/pygittools.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ tasks_test.py
 ./hook_samples/post-commit.push-remotes
 ./hook_samples/post-receive.notify
 ./hook_samples/pre-commit.ruff
+./hook_samples/pre-receive.branch-permissions
 ./hook_samples/pre-receive.protected-pattern
 ./tui/__init__.py
 ./tui/app.py
@@ -98,6 +99,7 @@ hook_samples/post-commit.notify
 hook_samples/post-commit.push-remotes
 hook_samples/post-receive.notify
 hook_samples/pre-commit.ruff
+hook_samples/pre-receive.branch-permissions
 hook_samples/pre-receive.protected-pattern
 pygittools.egg-info/PKG-INFO
 pygittools.egg-info/SOURCES.txt

{pygittools-0.2.1 → pygittools-0.2.2}/pygittools.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 pgt = pygittools.main:main
-pygittools-mcp = pygittools.mcp_server:main

{pygittools-0.2.1 → pygittools-0.2.2}/pygittools.egg-info/requires.txt

@@ -1,3 +1,2 @@
-mcp>=1.28.0
 pygit2>=1.12.0
 uni-curses>=3.1.2

{pygittools-0.2.1 → pygittools-0.2.2}/pyproject.toml

@@ -4,21 +4,19 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygittools"
-version = "0.2.1"
+version = "0.2.2"
 description = "Hooks and task storage in Git"
 readme = "README.md"
 license = "MIT"
 license-files = ["LICENSE"]
 requires-python = ">=3.11"
 dependencies = [
-    "mcp>=1.28.0",
     "pygit2>=1.12.0",
     "uni-curses>=3.1.2",
 ]
 
 [project.scripts]
 pgt = "pygittools.main:main"
-pygittools-mcp = "pygittools.mcp_server:main"
 
 [tool.setuptools]
 packages = ["pygittools", "pygittools.tui", "pygittools.tui.pages"]

{pygittools-0.2.1 → pygittools-0.2.2}/tasks.py

@@ -108,6 +108,7 @@ class Task:
 		priority: Priority | None = None,
 		assignee: str | None = None,
 		due_date: datetime | None = None,
+		tags: str = "",
 	):
 		if name is None:
 			name = f"{TASK_REF_PREFIX}{title.lower().replace(' ', '_')}"
@@ -124,6 +125,7 @@ class Task:
 		self.priority = priority
 		self.assignee = assignee
 		self.due_date = due_date
+		self.tags = tags
 		self.created_at = datetime.now()
 		self.comments: list[Oid | str] = []  # Comment OIDs
 		self.update_message()
@@ -180,6 +182,7 @@ def get_task(repo: Repository, ref: str) -> Task | None:
 		priority=priority,
 		assignee=j.get("assignee"),
 		due_date=_parse_dt(j.get("due_date")),
+		tags=j.get("tags", "") or "",
 	)
 	t.comments = j.get("comments", [])
 	t.created_at = _parse_dt(j.get("created_at")) or t.created_at
@@ -205,6 +208,7 @@ def get_task_by_oid(repo: Repository, oid: Oid) -> Task | None:
 		priority=priority,
 		assignee=j.get("assignee"),
 		due_date=_parse_dt(j.get("due_date")),
+		tags=j.get("tags", "") or "",
 	)
 	t.comments = j.get("comments", [])
 	t.created_at = _parse_dt(j.get("created_at")) or t.created_at

{pygittools-0.2.1 → pygittools-0.2.2}/tui/worktree.py

@@ -44,9 +44,7 @@ def _index_path(path: str) -> str:
 
 
 def stage_path(repo: Repository, path: str) -> None:
-	index = repo.index
-	index.add(_index_path(path))
-	index.write()
+	stage_paths(repo, [path])
 
 
 def stage_paths(repo: Repository, paths: list[str]) -> None:
@@ -54,7 +52,11 @@ def stage_paths(repo: Repository, paths: list[str]) -> None:
 		return
 	index = repo.index
 	for path in paths:
-		index.add(_index_path(path))
+		status_flags = repo.status().get(path, 0)
+		if status_flags & FileStatus.WT_DELETED:
+			index.remove(path)
+		else:
+			index.add(_index_path(path))
 	index.write()
 
 

{pygittools-0.2.1 → pygittools-0.2.2}/tui/worktree_test.py

@@ -77,6 +77,29 @@ def test_stage_paths_accepts_untracked_directory_trailing_slash(repo: Repository
 	assert status["loose.txt"] & FileStatus.INDEX_NEW
 
 
+def test_stage_paths_stages_deleted_files(committed_repo: Repository) -> None:
+	workdir = Path(committed_repo.workdir)
+	(workdir / "tracked.txt").unlink()
+
+	_, unstaged, _ = categorize_status(committed_repo)
+	assert "tracked.txt" in unstaged
+
+	stage_paths(committed_repo, unstaged)
+
+	status = committed_repo.status()
+	assert status["tracked.txt"] & FileStatus.INDEX_DELETED
+
+
+def test_stage_path_stages_deleted_file(committed_repo: Repository) -> None:
+	workdir = Path(committed_repo.workdir)
+	(workdir / "tracked.txt").unlink()
+
+	stage_path(committed_repo, "tracked.txt")
+
+	status = committed_repo.status()
+	assert status["tracked.txt"] & FileStatus.INDEX_DELETED
+
+
 def test_stage_paths_noop_for_empty_list(repo: Repository) -> None:
 	stage_paths(repo, [])
 

pygittools-0.2.1/mcp_server.py

@@ -1,120 +0,0 @@
-"""MCP server exposing pygittools task boards to AI clients."""
-
-from __future__ import annotations
-
-import json
-import os
-
-from mcp.server.fastmcp import FastMCP
-
-from pygittools.tasks_query import (
-	BoardColumnView,
-	BoardView,
-	RepoLocation,
-	TaskView,
-	discover_repo_path,
-	get_board_tasks_grouped,
-	get_task_view,
-	list_boards,
-	list_tasks,
-	open_repository,
-	resolve_repo_location,
-)
-
-mcp = FastMCP(
-	"pygittools-tasks",
-	instructions=(
-		"Read task boards stored as Git annotated tags. "
-		"Boards live under refs/tags/boards/, tasks under refs/tags/tasks/, "
-		"and comments under refs/tags/comments/. "
-		"Set PYGITTOOLS_REPO to a repository path, or PYGITWEB_PROJECTROOT plus a project name."
-	),
-	json_response=True,
-)
-
-
-def _repo_for_tool(project: str | None = None) -> RepoLocation:
-	return resolve_repo_location(project=project)
-
-
-@mcp.tool(title="List boards")
-def list_boards_tool(project: str | None = None) -> list[BoardView]:
-	"""List all task boards in the configured repository."""
-	location = _repo_for_tool(project)
-	repo = open_repository(location)
-	return list_boards(repo)
-
-
-@mcp.tool(title="List tasks")
-def list_tasks_tool(
-	board: str = "Tasks",
-	project: str | None = None,
-	include_comments: bool = True,
-) -> list[TaskView]:
-	"""List tasks on a board, optionally including comment bodies."""
-	location = _repo_for_tool(project)
-	repo = open_repository(location)
-	try:
-		return list_tasks(repo, board, include_comments=include_comments)
-	except KeyError as exc:
-		raise ValueError(str(exc)) from exc
-
-
-@mcp.tool(title="Get task")
-def get_task_tool(task_ref: str, project: str | None = None) -> TaskView:
-	"""Get one task by ref slug (task_123) or full ref (refs/tags/tasks/task_123)."""
-	location = _repo_for_tool(project)
-	repo = open_repository(location)
-	try:
-		return get_task_view(repo, task_ref, include_comments=True)
-	except KeyError as exc:
-		raise ValueError(str(exc)) from exc
-
-
-@mcp.tool(title="Board grouped by status")
-def board_by_status_tool(
-	board: str = "Tasks",
-	project: str | None = None,
-	include_comments: bool = True,
-) -> list[BoardColumnView]:
-	"""Return board tasks grouped into status columns (TODO, IN_PROGRESS, etc.)."""
-	location = _repo_for_tool(project)
-	repo = open_repository(location)
-	try:
-		return get_board_tasks_grouped(repo, board, include_comments=include_comments)
-	except KeyError as exc:
-		raise ValueError(str(exc)) from exc
-
-
-@mcp.resource("board://{board_name}")
-def board_resource(board_name: str) -> str:
-	"""JSON snapshot of a board grouped by status."""
-	location = resolve_repo_location()
-	repo = open_repository(location)
-	columns = get_board_tasks_grouped(repo, board_name, include_comments=True)
-	return json.dumps(columns, indent=2)
-
-
-@mcp.resource("task://{task_ref}")
-def task_resource(task_ref: str) -> str:
-	"""JSON snapshot of a single task with comments."""
-	location = resolve_repo_location()
-	repo = open_repository(location)
-	task = get_task_view(repo, task_ref, include_comments=True)
-	return json.dumps(task, indent=2)
-
-
-def main() -> None:
-	repo_env = os.environ.get("PYGITTOOLS_REPO", "").strip()
-	if not repo_env:
-		try:
-			discovered = discover_repo_path()
-		except FileNotFoundError:
-			discovered = None
-		if discovered is not None:
-			os.environ["PYGITTOOLS_REPO"] = str(discovered)
-	mcp.run(transport="stdio")
-
-
-if __name__ == "__main__":
-	main()