bingo-light 2.1.1 → 2.1.3

package/mcp-server.py

@@ -231,7 +231,7 @@ TOOLS = [
         "name": "bingo_doctor",
         "description": (
             "Diagnose setup issues: checks git version, rerere, upstream remote, branch structure, "
-            "and tests whether patches apply cleanly on latest upstream."
+            "and tests whether patches apply cleanly on latest upstream. Use report=true for extended checks."
         ),
         "inputSchema": {
             "type": "object",
@@ -239,6 +239,10 @@ TOOLS = [
                 "cwd": {
                     "type": "string",
                     "description": "Path to the git repository"
+                },
+                "report": {
+                    "type": "boolean",
+                    "description": "Include extended checks (team locks, expiry, deps)"
                 }
             },
             "required": ["cwd"]
@@ -283,8 +287,10 @@ TOOLS = [
     {
         "name": "bingo_conflict_analyze",
         "description": (
-            "Analyze current rebase conflicts. Returns structured info about each conflicted file: "
-            "the 'ours' version (upstream), 'theirs' version (your patch), conflict count, and resolution hints. "
+            "Analyze current rebase conflicts. Returns structured info about each conflicted file "
+            "(ours/theirs, conflict count, hints) plus patch_intent (name, subject, full commit "
+            "message, original_sha, original_diff, meta, stack_position) and verify "
+            "(test_command + per-file syntax/parse commands). "
             "Call this when bingo_sync reports a conflict to understand what needs fixing."
         ),
         "inputSchema": {
@@ -302,7 +308,9 @@ TOOLS = [
         "name": "bingo_conflict_resolve",
         "description": (
             "Resolve a conflict during rebase by writing the resolved content to a file, "
-            "staging it, and continuing the rebase. Use after bingo_conflict_analyze."
+            "staging it, and continuing the rebase. Use after bingo_conflict_analyze. "
+            "Set verify=true to run test.command after the final rebase --continue; "
+            "the result is attached as verify_result."
         ),
         "inputSchema": {
             "type": "object",
@@ -318,6 +326,10 @@ TOOLS = [
                 "content": {
                     "type": "string",
                     "description": "The fully resolved file content (no conflict markers)"
+                },
+                "verify": {
+                    "type": "boolean",
+                    "description": "If true, run test.command after the final rebase --continue. Default false."
                 }
             },
             "required": ["cwd", "file", "content"]
@@ -469,6 +481,256 @@ TOOLS = [
             "required": ["cwd"]
         }
     },
+    # ── Dependency Patching Tools ─────────────────────────────────────────
+    {
+        "name": "bingo_dep_patch",
+        "description": (
+            "Create a patch for a modified npm/pip dependency. After modifying files in "
+            "node_modules/ or site-packages/, call this to generate a .patch file. "
+            "The patch survives npm install / pip install via `bingo_dep_apply`."
+        ),
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"},
+                "package": {"type": "string", "description": "Package name (e.g. 'lodash', 'requests')"},
+                "patch_name": {"type": "string", "description": "Optional patch name"},
+                "description": {"type": "string", "description": "What this patch fixes"}
+            },
+            "required": ["cwd", "package"]
+        }
+    },
+    {
+        "name": "bingo_dep_apply",
+        "description": (
+            "Re-apply all dependency patches after npm install / pip install. "
+            "Call this as a postinstall hook or after any package manager update."
+        ),
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"},
+                "package": {"type": "string", "description": "Optional: apply only this package's patches"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_dep_status",
+        "description": (
+            "Show health of all dependency patches. Reports version mismatches "
+            "(upstream updated but patches were generated against old version)."
+        ),
+        "inputSchema": {
+            "type": "object",
+            "properties": {"cwd": {"type": "string", "description": "Project directory"}},
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_dep_sync",
+        "description": (
+            "After npm update / pip install --upgrade, re-apply patches and detect conflicts. "
+            "Returns ok if all patches apply cleanly, or conflict details if patches broke."
+        ),
+        "inputSchema": {
+            "type": "object",
+            "properties": {"cwd": {"type": "string", "description": "Project directory"}},
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_dep_list",
+        "description": "List all dependency patches across all tracked packages.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {"cwd": {"type": "string", "description": "Project directory"}},
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_dep_drop",
+        "description": "Remove a dependency patch or all patches for a package.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"},
+                "package": {"type": "string", "description": "Package name"},
+                "patch_name": {"type": "string", "description": "Specific patch to drop (omit for all)"}
+            },
+            "required": ["cwd", "package"]
+        }
+    },
+    # ── Team / Locking tools ────────────────────────────────────────────
+    {
+        "name": "bingo_patch_lock",
+        "description": "Lock a patch for exclusive editing. Prevents other team members from editing or dropping it.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Path to the git repository"},
+                "name": {"type": "string", "description": "Patch name to lock"},
+                "reason": {"type": "string", "description": "Why you are locking this patch"}
+            },
+            "required": ["cwd", "name"]
+        }
+    },
+    {
+        "name": "bingo_patch_unlock",
+        "description": "Unlock a patch, allowing other team members to edit or drop it.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Path to the git repository"},
+                "name": {"type": "string", "description": "Patch name to unlock"},
+                "force": {"type": "boolean", "description": "Force unlock even if locked by someone else"}
+            },
+            "required": ["cwd", "name"]
+        }
+    },
+    # ── Smart Patch Management tools ────────────────────────────────────
+    {
+        "name": "bingo_patch_check",
+        "description": "Check if patches are still needed. Detects if upstream has merged equivalent changes, making a patch obsolete.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Path to the git repository"},
+                "name": {"type": "string", "description": "Patch name to check (omit for all patches)"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_patch_upstream",
+        "description": "Export a patch as a clean PR-ready diff suitable for submitting to the upstream repository.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Path to the git repository"},
+                "name": {"type": "string", "description": "Patch name to export"}
+            },
+            "required": ["cwd", "name"]
+        }
+    },
+    {
+        "name": "bingo_patch_expire",
+        "description": "List patches that have passed their expiry date or are expiring soon (within 7 days).",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Path to the git repository"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_patch_stats",
+        "description": "Get health metrics for all patches: age, size, conflict frequency.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Path to the git repository"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    # ── Report tool ─────────────────────────────────────────────────────
+    {
+        "name": "bingo_report",
+        "description": "Generate a comprehensive markdown health report covering patches, sync status, team locks, expiry, and dependencies.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Path to the git repository"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    # ── npm Override Management tools ───────────────────────────────────
+    {
+        "name": "bingo_dep_override_list",
+        "description": "List all npm overrides/yarn resolutions with tracked reasons.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_dep_override_check",
+        "description": "Check if npm overrides are still needed by comparing against package-lock.json resolved versions.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_dep_override_add",
+        "description": "Add an npm override to package.json with reason tracking.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"},
+                "package": {"type": "string", "description": "Package to override"},
+                "version": {"type": "string", "description": "Version to force"},
+                "reason": {"type": "string", "description": "Why this override exists"}
+            },
+            "required": ["cwd", "package", "version"]
+        }
+    },
+    {
+        "name": "bingo_dep_override_drop",
+        "description": "Remove an npm override from package.json and tracking.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"},
+                "package": {"type": "string", "description": "Package to remove override for"}
+            },
+            "required": ["cwd", "package"]
+        }
+    },
+    # ── Fork-as-Dependency Tracking tools ───────────────────────────────
+    {
+        "name": "bingo_dep_fork_list",
+        "description": "List all git-based dependencies in package.json (github:user/repo, git+https://, etc.).",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_dep_fork_check",
+        "description": "Check fork drift: compare git dependency refs against latest npm releases and GitHub commits.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"}
+            },
+            "required": ["cwd"]
+        }
+    },
+    {
+        "name": "bingo_dep_fork_sync",
+        "description": "Update a fork dependency ref in package.json to the latest GitHub commit.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "cwd": {"type": "string", "description": "Project directory"},
+                "package": {"type": "string", "description": "Package to update"}
+            },
+            "required": ["cwd", "package"]
+        }
+    },
 ]
 
 # ─── Command Mapping ──────────────────────────────────────────────────────────
@@ -520,7 +782,7 @@ def handle_tool_call(name: str, arguments: dict) -> dict:
             return _result(repo.undo())
 
         elif name == "bingo_doctor":
-            return _result(repo.doctor())
+            return _result(repo.doctor(report=arguments.get("report", False)))
 
         elif name == "bingo_diff":
             return _result(repo.diff())
@@ -535,6 +797,7 @@ def handle_tool_call(name: str, arguments: dict) -> dict:
             return _result(repo.conflict_resolve(
                 arguments.get("file", ""),
                 arguments.get("content", ""),
+                verify=bool(arguments.get("verify", False)),
             ))
 
         elif name == "bingo_log":
@@ -629,6 +892,83 @@ def handle_tool_call(name: str, arguments: dict) -> dict:
         elif name == "bingo_workspace_status":
             return _result(repo.workspace_status())
 
+        # ── Team / Locking tools ──────────────────────────────────────────
+        elif name == "bingo_patch_lock":
+            return _result(repo.patch_lock(
+                arguments["name"],
+                reason=arguments.get("reason", ""),
+            ))
+
+        elif name == "bingo_patch_unlock":
+            return _result(repo.patch_unlock(
+                arguments["name"],
+                force=arguments.get("force", False),
+            ))
+
+        # ── Smart Patch Management tools ──────────────────────────────────
+        elif name == "bingo_patch_check":
+            return _result(repo.patch_check(arguments.get("name", "")))
+
+        elif name == "bingo_patch_upstream":
+            return _result(repo.patch_upstream(arguments["name"]))
+
+        elif name == "bingo_patch_expire":
+            return _result(repo.patch_expire())
+
+        elif name == "bingo_patch_stats":
+            return _result(repo.patch_stats())
+
+        # ── Report tool ───────────────────────────────────────────────────
+        elif name == "bingo_report":
+            return _result(repo.report())
+
+        # ── Dependency patching tools ────────────────────────────────────
+        elif name.startswith("bingo_dep_"):
+            from bingo_core.dep import DepManager
+            dm = DepManager(cwd)
+
+            if name == "bingo_dep_patch":
+                return _result(dm.patch(
+                    arguments["package"],
+                    arguments.get("patch_name", ""),
+                    arguments.get("description", ""),
+                ))
+            elif name == "bingo_dep_apply":
+                return _result(dm.apply(arguments.get("package", "")))
+            elif name == "bingo_dep_status":
+                return _result(dm.status())
+            elif name == "bingo_dep_sync":
+                return _result(dm.sync())
+            elif name == "bingo_dep_list":
+                return _result(dm.list_patches())
+            elif name == "bingo_dep_drop":
+                return _result(dm.drop(
+                    arguments["package"],
+                    arguments.get("patch_name", ""),
+                ))
+            # Override management
+            elif name == "bingo_dep_override_list":
+                return _result(dm.override_list())
+            elif name == "bingo_dep_override_check":
+                return _result(dm.override_check())
+            elif name == "bingo_dep_override_add":
+                return _result(dm.override_add(
+                    arguments["package"], arguments["version"],
+                    arguments.get("reason", ""),
+                ))
+            elif name == "bingo_dep_override_drop":
+                return _result(dm.override_drop(arguments["package"]))
+            # Fork tracking
+            elif name.startswith("bingo_dep_fork_"):
+                from bingo_core.dep_fork import ForkTracker
+                ft = ForkTracker(cwd)
+                if name == "bingo_dep_fork_list":
+                    return _result(ft.fork_list())
+                elif name == "bingo_dep_fork_check":
+                    return _result(ft.fork_check())
+                elif name == "bingo_dep_fork_sync":
+                    return _result(ft.fork_sync(arguments["package"]))
+
         else:
             return {
                 "content": [{"type": "text", "text": f"Unknown tool: {name}"}],
@@ -754,7 +1094,7 @@ def main():
                 "capabilities": {"tools": {}},
                 "serverInfo": {
                     "name": "bingo-light",
-                    "version": "2.1.1",
+                    "version": "2.1.3",
                 },
             }))
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingo-light",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "AI-native fork maintenance — manage customizations as a clean patch stack on top of upstream",
   "keywords": ["git", "fork", "patch", "mcp", "ai", "maintenance", "upstream", "rebase"],
   "homepage": "https://github.com/DanOps-1/bingo-light",