bingo-light 2.1.2 → 2.2.0

package/bingo_core/semantic.py

@@ -0,0 +1,85 @@
+"""
+bingo_core.semantic — semantic classification of conflict regions.
+
+Given ours/theirs text for a single conflict region, return one of:
+    "whitespace"       — regions differ only in whitespace
+    "import_reorder"   — both regions are only import statements,
+                         same set of imports, just reordered
+    "signature_change" — function/method signature changed (params
+                         added, removed, or renamed) but name same
+    "logic"            — default; real logic change requiring human
+                         or AI reasoning
+
+The classifier is intentionally conservative: when unsure, return
+"logic" so callers treat it as a real conflict.
+
+Python 3.8+ stdlib only.
+"""
+
+from __future__ import annotations
+
+import re
+
+# Matches Python "import X" or "from X import Y" lines.
+_IMPORT_RE_PY = re.compile(r"^\s*(?:import|from)\s+\S")
+# Matches JS/TS imports and CommonJS require.
+_IMPORT_RE_JS = re.compile(r"^\s*(?:import\s|const\s+\w+\s*=\s*require\()")
+
+# Function signature captures: (name, params) for Python def and JS function.
+_FN_SIG_PY = re.compile(r"^\s*(?:async\s+)?def\s+(\w+)\s*\(([^)]*)\)")
+_FN_SIG_JS = re.compile(r"^\s*(?:async\s+)?function\s+(\w+)\s*\(([^)]*)\)")
+
+
+def classify_conflict(ours: str, theirs: str, file: str = "") -> str:
+    """Classify a conflict region as whitespace / import_reorder /
+    signature_change / logic.
+
+    `file` is accepted for future extension (language-specific rules)
+    but not currently used.
+    """
+    if _is_whitespace_only(ours, theirs):
+        return "whitespace"
+    if _is_import_reorder(ours, theirs):
+        return "import_reorder"
+    if _is_signature_change(ours, theirs):
+        return "signature_change"
+    return "logic"
+
+
+def _is_whitespace_only(a: str, b: str) -> bool:
+    """True if the only difference is whitespace (tabs, spaces, newlines).
+
+    All whitespace is removed for comparison — matching git's
+    `diff --ignore-all-space` semantics.
+    """
+    na = "".join(a.split())
+    nb = "".join(b.split())
+    return na == nb and na != ""
+
+
+def _is_import_reorder(a: str, b: str) -> bool:
+    """True if both sides contain only import statements, with the same
+    set of imports (just reordered)."""
+    a_lines = [ln for ln in a.splitlines() if ln.strip()]
+    b_lines = [ln for ln in b.splitlines() if ln.strip()]
+    if not a_lines or not b_lines:
+        return False
+    for line in a_lines + b_lines:
+        if not (_IMPORT_RE_PY.match(line) or _IMPORT_RE_JS.match(line)):
+            return False
+    # Compare as sorted sets: order-insensitive match.
+    return sorted(a_lines) == sorted(b_lines)
+
+
+def _is_signature_change(a: str, b: str) -> bool:
+    """True if both sides contain a function definition for the same
+    name but with different parameter lists."""
+    for pattern in (_FN_SIG_PY, _FN_SIG_JS):
+        a_match = pattern.search(a)
+        b_match = pattern.search(b)
+        if a_match and b_match:
+            same_name = a_match.group(1) == b_match.group(1)
+            different_params = a_match.group(2).strip() != b_match.group(2).strip()
+            if same_name and different_params:
+                return True
+    return False

package/bingo_core/state.py

@@ -184,7 +184,7 @@ class State:
             for t in (v.strip() for v in value.split(",")):
                 if t and t not in tags_list:
                     tags_list.append(t)
-        elif key in ("reason", "expires", "upstream_pr", "status"):
+        elif key in ("reason", "expires", "upstream_pr", "status", "owner"):
             p[key] = value
         self._save_metadata(data)
 

package/bingo_core/team.py

@@ -0,0 +1,170 @@
+"""
+bingo_core.team — Team collaboration state (.bingo/team.json).
+
+Manages patch locks and team membership for multi-person fork maintenance.
+Advisory locking: prevents accidental concurrent edits, not a security boundary.
+
+Storage:
+    .bingo/team.json
+    {
+        "locks": {
+            "<patch_name>": {
+                "owner": "<user>",
+                "locked_at": "ISO8601",
+                "reason": ""
+            }
+        }
+    }
+
+Python 3.8+ stdlib only.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import tempfile
+from datetime import datetime, timezone
+from typing import List, Optional
+
+from bingo_core import BINGO_DIR
+from bingo_core.exceptions import BingoError
+
+
+class TeamState:
+    """Manages .bingo/team.json for patch locking and team coordination."""
+
+    def __init__(self, repo_dir: str, git=None):
+        self.repo_dir = repo_dir
+        self._git = git  # optional Git instance for get_user()
+        self.bingo_dir = os.path.join(repo_dir, BINGO_DIR)
+        self.team_file = os.path.join(self.bingo_dir, "team.json")
+
+    def _load(self) -> dict:
+        """Load team.json, returning empty structure if missing."""
+        if not os.path.isfile(self.team_file):
+            return {"locks": {}}
+        try:
+            with open(self.team_file) as f:
+                data = json.load(f)
+            if "locks" not in data:
+                data["locks"] = {}
+            return data
+        except (json.JSONDecodeError, IOError):
+            return {"locks": {}}
+
+    def _save(self, data: dict) -> None:
+        """Atomically write team.json."""
+        os.makedirs(self.bingo_dir, exist_ok=True)
+        dir_name = os.path.dirname(self.team_file)
+        fd, tmp_path = tempfile.mkstemp(suffix=".tmp", dir=dir_name)
+        try:
+            with os.fdopen(fd, "w") as f:
+                json.dump(data, f, indent=2)
+            os.replace(tmp_path, self.team_file)
+        except Exception:
+            try:
+                os.unlink(tmp_path)
+            except FileNotFoundError:
+                pass
+            raise
+
+    def get_user(self) -> str:
+        """Detect current user from git config or environment."""
+        if self._git:
+            for key in ("user.name", "user.email"):
+                try:
+                    val = self._git.run("config", key, check=False)
+                    if val and val.strip():
+                        return val.strip()
+                except Exception:
+                    pass
+        return os.environ.get("USER", "unknown")
+
+    def lock(self, patch_name: str, owner: str = "", reason: str = "") -> dict:
+        """Lock a patch for exclusive editing.
+
+        Returns {"ok": True, "patch": ..., "owner": ..., "locked_at": ...}
+        Raises BingoError if already locked by another user.
+        """
+        if not owner:
+            owner = self.get_user()
+        data = self._load()
+        existing = data["locks"].get(patch_name)
+        if existing and existing["owner"] != owner:
+            raise BingoError(
+                f"Patch '{patch_name}' is locked by {existing['owner']} "
+                f"(since {existing['locked_at']}). "
+                f"They must unlock it first, or use --force."
+            )
+        now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
+        data["locks"][patch_name] = {
+            "owner": owner,
+            "locked_at": now,
+            "reason": reason,
+        }
+        self._save(data)
+        return {
+            "ok": True,
+            "patch": patch_name,
+            "owner": owner,
+            "locked_at": now,
+            "reason": reason,
+        }
+
+    def unlock(self, patch_name: str, owner: str = "", force: bool = False) -> dict:
+        """Unlock a patch.
+
+        Returns {"ok": True, "patch": ..., "owner": ...}
+        Raises BingoError if locked by someone else (unless force=True).
+        """
+        if not owner:
+            owner = self.get_user()
+        data = self._load()
+        existing = data["locks"].get(patch_name)
+        if not existing:
+            return {"ok": True, "patch": patch_name, "owner": owner, "was_locked": False}
+        if existing["owner"] != owner and not force:
+            raise BingoError(
+                f"Patch '{patch_name}' is locked by {existing['owner']}. "
+                "Use --force to override."
+            )
+        del data["locks"][patch_name]
+        self._save(data)
+        return {
+            "ok": True,
+            "patch": patch_name,
+            "owner": owner,
+            "was_locked": True,
+            "previous_owner": existing["owner"],
+        }
+
+    def get_lock(self, patch_name: str) -> Optional[dict]:
+        """Get lock info for a patch, or None if unlocked."""
+        data = self._load()
+        return data["locks"].get(patch_name)
+
+    def is_locked_by_other(self, patch_name: str, current_user: str = "") -> bool:
+        """Check if a patch is locked by someone other than current_user."""
+        if not current_user:
+            current_user = self.get_user()
+        lock = self.get_lock(patch_name)
+        if not lock:
+            return False
+        return lock["owner"] != current_user
+
+    def list_locks(self) -> List[dict]:
+        """List all active locks.
+
+        Returns list of {"patch": ..., "owner": ..., "locked_at": ..., "reason": ...}
+        """
+        data = self._load()
+        result = []
+        for patch_name, info in data["locks"].items():
+            result.append({
+                "patch": patch_name,
+                "owner": info.get("owner", ""),
+                "locked_at": info.get("locked_at", ""),
+                "reason": info.get("reason", ""),
+            })
+        return result

package/completions/bingo-light.bash

@@ -10,11 +10,11 @@ _bingo_light() {
     local cur prev words cword
     _init_completion || return
 
-    local -r toplevel_commands="init setup patch dep sync status doctor auto-sync log undo diff version help conflict-analyze conflict-resolve config history test workspace smart-sync session"
+    local -r toplevel_commands="init setup patch dep sync status doctor auto-sync log undo diff version help conflict-analyze conflict-resolve config history test workspace smart-sync session report"
     local -r toplevel_aliases="p s st d ws"
     local -r all_toplevel="${toplevel_commands} ${toplevel_aliases}"
 
-    local -r patch_subcommands="new list show edit drop export import reorder squash meta"
+    local -r patch_subcommands="new list show edit drop export import reorder squash meta lock unlock check upstream expire stats"
     local -r patch_aliases="ls add create rm remove"
     local -r all_patch="${patch_subcommands} ${patch_aliases}"
 
@@ -39,7 +39,7 @@ _bingo_light() {
             dep)
                 cmd="dep"
                 ;;
-            init|setup|doctor|auto-sync|log|undo|version|help|conflict-analyze|conflict-resolve|config|history|test|workspace|ws|smart-sync|session)
+            init|setup|doctor|auto-sync|log|undo|version|help|conflict-analyze|conflict-resolve|config|history|test|workspace|ws|smart-sync|session|report)
                 cmd="${words[i]}"
                 ;;
             *)
@@ -94,10 +94,20 @@ _bingo_light() {
         return
     fi
 
+    # Inside "conflict-resolve"
+    if [[ "$cmd" == "conflict-resolve" ]]; then
+        COMPREPLY=( $(compgen -W "--verify --content-stdin --help -h" -- "$cur") )
+        return
+    fi
+
     # Inside "dep" -- complete subcommands
     if [[ "$cmd" == "dep" ]]; then
         if [[ -z "$subcmd" ]]; then
-            COMPREPLY=( $(compgen -W "patch apply sync status list drop" -- "$cur") )
+            COMPREPLY=( $(compgen -W "patch apply sync status list drop override fork" -- "$cur") )
+        elif [[ "$subcmd" == "override" ]]; then
+            COMPREPLY=( $(compgen -W "list check add drop" -- "$cur") )
+        elif [[ "$subcmd" == "fork" ]]; then
+            COMPREPLY=( $(compgen -W "list check sync" -- "$cur") )
         else
             COMPREPLY=( $(compgen -W "--help -h" -- "$cur") )
         fi

package/completions/bingo-light.fish

@@ -86,6 +86,7 @@ complete -c bingo-light -n __bingo_light_needs_command -a test    -d 'Run config
 complete -c bingo-light -n __bingo_light_needs_command -a workspace -d 'Manage multiple forks'
 complete -c bingo-light -n __bingo_light_needs_command -a smart-sync -d 'Smart sync with circuit breaker and partial state'
 complete -c bingo-light -n __bingo_light_needs_command -a session -d 'Manage session memory'
+complete -c bingo-light -n __bingo_light_needs_command -a report  -d 'Generate fork health report'
 
 # Short aliases
 complete -c bingo-light -n __bingo_light_needs_command -a p  -d 'Alias for patch'
@@ -123,9 +124,11 @@ complete -c bingo-light -n '__bingo_light_using_command version'   -s h -l help
 
 # ---- conflict-resolve flags ----
 complete -c bingo-light -n '__bingo_light_using_command conflict-resolve' -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_using_command conflict-resolve' -l verify -d 'Run test.command after the final rebase continues'
+complete -c bingo-light -n '__bingo_light_using_command conflict-resolve' -l content-stdin -d 'Read resolved content from stdin'
 
 # ---- help: complete with command names ----
-complete -c bingo-light -n '__bingo_light_using_command help' -a 'init setup patch dep sync status doctor auto-sync log undo diff version conflict-analyze conflict-resolve config history test workspace smart-sync session' -d 'Command'
+complete -c bingo-light -n '__bingo_light_using_command help' -a 'init setup patch dep sync status doctor auto-sync log undo diff version conflict-analyze conflict-resolve config history test workspace smart-sync session report' -d 'Command'
 
 # ---- patch subcommands (also alias "p") ----
 complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a new     -d 'Create a new patch'
@@ -138,6 +141,12 @@ complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a import  -d 'I
 complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a reorder -d 'Reorder the patch stack'
 complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a squash  -d 'Squash two patches into one'
 complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a meta    -d 'Get/set patch metadata'
+complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a lock    -d 'Lock a patch for exclusive editing'
+complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a unlock  -d 'Unlock a patch'
+complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a check   -d 'Check if patches are still needed'
+complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a upstream -d 'Export patch as PR-ready diff'
+complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a expire  -d 'List expired patches'
+complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a stats   -d 'Show patch health metrics'
 
 # Patch short aliases
 complete -c bingo-light -n __bingo_light_patch_needs_subcommand -a ls     -d 'Alias for list'
@@ -163,6 +172,14 @@ complete -c bingo-light -n '__bingo_light_patch_using_subcommand import'
 complete -c bingo-light -n '__bingo_light_patch_using_subcommand reorder'           -s h -l help -d 'Show help'
 complete -c bingo-light -n '__bingo_light_patch_using_subcommand squash'            -s h -l help -d 'Show help'
 complete -c bingo-light -n '__bingo_light_patch_using_subcommand meta'              -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_patch_using_subcommand lock'              -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_patch_using_subcommand lock'              -l reason   -d 'Reason for locking'
+complete -c bingo-light -n '__bingo_light_patch_using_subcommand unlock'            -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_patch_using_subcommand unlock'            -l force    -d 'Force unlock even if locked by someone else'
+complete -c bingo-light -n '__bingo_light_patch_using_subcommand check'             -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_patch_using_subcommand upstream'          -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_patch_using_subcommand expire'            -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_patch_using_subcommand stats'             -s h -l help -d 'Show help'
 
 # ---- dep subcommands ----
 
@@ -185,7 +202,9 @@ complete -c bingo-light -n __bingo_light_dep_needs_subcommand -a apply  -d 'Re-a
 complete -c bingo-light -n __bingo_light_dep_needs_subcommand -a sync   -d 'Re-apply after update, detect conflicts'
 complete -c bingo-light -n __bingo_light_dep_needs_subcommand -a status -d 'Show patch health'
 complete -c bingo-light -n __bingo_light_dep_needs_subcommand -a list   -d 'List all dependency patches'
-complete -c bingo-light -n __bingo_light_dep_needs_subcommand -a drop   -d 'Remove a dependency patch'
+complete -c bingo-light -n __bingo_light_dep_needs_subcommand -a drop     -d 'Remove a dependency patch'
+complete -c bingo-light -n __bingo_light_dep_needs_subcommand -a override -d 'Manage npm overrides/resolutions'
+complete -c bingo-light -n __bingo_light_dep_needs_subcommand -a fork     -d 'Track fork-as-dependency drift'
 
 # ---- workspace subcommands (also alias "ws") ----
 
@@ -219,3 +238,5 @@ complete -c bingo-light -n '__bingo_light_using_command test'             -s h -
 complete -c bingo-light -n '__bingo_light_using_command workspace ws'     -s h -l help -d 'Show help'
 complete -c bingo-light -n '__bingo_light_using_command smart-sync'      -s h -l help -d 'Show help'
 complete -c bingo-light -n '__bingo_light_using_command session'         -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_using_command report'          -s h -l help -d 'Show help'
+complete -c bingo-light -n '__bingo_light_using_command doctor'          -l report    -d 'Include team, expiry, and dep checks'

package/completions/bingo-light.zsh

@@ -30,6 +30,7 @@ _bingo-light() {
         'workspace:Manage multiple forks'
         'smart-sync:Smart sync with circuit breaker and partial state'
         'session:Manage session memory'
+        'report:Generate fork health report'
     )
 
     local -a toplevel_aliases=(
@@ -51,6 +52,12 @@ _bingo-light() {
         'reorder:Reorder the patch stack'
         'squash:Squash two patches into one'
         'meta:Get/set patch metadata'
+        'lock:Lock a patch for exclusive editing'
+        'unlock:Unlock a patch'
+        'check:Check if patches are still needed'
+        'upstream:Export patch as PR-ready diff'
+        'expire:List expired patches'
+        'stats:Show patch health metrics'
     )
 
     local -a patch_aliases=(
@@ -121,7 +128,7 @@ _bingo-light() {
                                 list|ls)
                                     _arguments $patch_list_flags
                                     ;;
-                                new|add|create|show|edit|drop|rm|remove|export|import|reorder|squash|meta)
+                                new|add|create|show|edit|drop|rm|remove|export|import|reorder|squash|meta|lock|unlock|check|upstream|expire|stats)
                                     _arguments $help_flag
                                     ;;
                             esac
@@ -145,6 +152,8 @@ _bingo-light() {
                         'status:Show patch health'
                         'list:List all dependency patches'
                         'drop:Remove a dependency patch'
+                        'override:Manage npm overrides/resolutions'
+                        'fork:Track fork-as-dependency drift'
                     )
                     _arguments -C \
                         '(- *)'{-h,--help}'[Show help]' \
@@ -175,7 +184,14 @@ _bingo-light() {
                             ;;
                     esac
                     ;;
-                init|setup|doctor|auto-sync|log|undo|version|conflict-analyze|conflict-resolve|config|history|test|smart-sync|session)
+                conflict-resolve)
+                    _arguments \
+                        '--verify[Run test.command after the final rebase continues]' \
+                        '--content-stdin[Read resolved content from stdin]' \
+                        $help_flag \
+                        '*:file:_files'
+                    ;;
+                init|setup|doctor|auto-sync|log|undo|version|conflict-analyze|config|history|test|smart-sync|session|report)
                     _arguments $help_flag
                     ;;
                 help)