oh-my-agent 20.5.0 → 20.6.0

package/assets/serena/dart_check.py

@@ -2,13 +2,32 @@
 
 import argparse
 import asyncio
+import inspect
 import json
 import subprocess
 import sys
 from pathlib import Path
 
 from mcp import ClientSession
-from mcp.client.streamable_http import streamablehttp_client
+
+try:  # mcp 1.x
+    from mcp.client.streamable_http import (
+        streamablehttp_client as _streamable_http_client,
+    )
+except ImportError:  # mcp 2.x renamed the transport
+    from mcp.client.streamable_http import (
+        streamable_http_client as _streamable_http_client,
+    )
+
+
+def streamable_http_client(url, timeout):
+    """Yield (read, write) streams for both mcp 1.x (3-tuple) and 2.x (2-tuple)."""
+    parameters = inspect.signature(_streamable_http_client).parameters
+    if "timeout" in parameters:
+        return _streamable_http_client(
+            url, timeout=timeout, sse_read_timeout=timeout
+        )
+    return _streamable_http_client(url)
 
 
 def git(root, *args):
@@ -57,9 +76,8 @@ async def run(args):
     sdk = Path(args.dart_sdk).expanduser().resolve(strict=True)
     index = check_index(root, package) if args.staged else None
     url = args.url
-    async with streamablehttp_client(
-        url, timeout=args.timeout, sse_read_timeout=args.timeout
-    ) as (read, write, _):
+    async with streamable_http_client(url, args.timeout) as streams:
+        read, write = streams[0], streams[1]
         async with ClientSession(read, write) as session:
             await session.initialize()
             response = await session.call_tool(

package/assets/serena/install.py

@@ -7,11 +7,32 @@ import importlib.util
 import json
 import os
 from pathlib import Path
+import re
 import tempfile
 
 IMPORT = "from .oma_dart import GetDartProjectDiagnosticsTool\n"
 CACHE_IMPORT = "from .oma_symbol_cache import install_symbol_cache as _install_symbol_cache\n_install_symbol_cache()\n"
-SUPPORTED = {"1.7.0"}
+# Patches target APIs that stayed stable across 1.7 and 2.0. Minors and patches
+# above the tested versions reuse them; a new major requires API re-validation.
+MIN_VERSION = (1, 7, 0)
+MAX_MAJOR = 2
+
+
+def version_tuple(version):
+    match = re.match(r"(\d+(?:\.\d+)*)", version)
+    if not match:
+        return None
+    parts = [int(part) for part in match.group(1).split(".")]
+    return tuple(parts + [0] * (3 - len(parts)))
+
+
+def is_supported(version):
+    parsed = version_tuple(version)
+    return (
+        parsed is not None
+        and parsed >= MIN_VERSION
+        and parsed[0] <= MAX_MAJOR
+    )
 
 
 def atomic_write(path, content):
@@ -28,11 +49,13 @@ def atomic_write(path, content):
 
 
 def reconcile(package, version, source, check_only=False):
-    if version not in SUPPORTED:
+    if not is_supported(version):
         return {
             "status": "unsupported",
             "version": version,
-            "error": f"Serena {version} is not supported by this OMA adapter (tested: 1.7.0)",
+            "error": f"Serena {version} is not supported by this OMA adapter "
+                     f"(supported: >={'.'.join(map(str, MIN_VERSION))}, "
+                     f"<{MAX_MAJOR + 1}.0.0)",
         }
     payload = (source / "oma_dart.py").read_text()
     cache_payload = (source / "oma_symbol_cache.py").read_text()

package/assets/serena/oma_dart.py

@@ -1,4 +1,4 @@
-"""Dart project diagnostics on Serena's existing language server (Serena 1.7).
+"""Dart project diagnostics on Serena's existing language server (Serena 1.7/2.0).
 
 Installed as serena.tools.oma_dart. No second analysis server is launched.
 """

package/assets/serena/oma_symbol_cache.py

@@ -1,4 +1,4 @@
-"""File-granular symbol caching for Serena 1.7.0's long-lived Python process.
+"""File-granular symbol caching for Serena 1.7/2.0's long-lived Python process.
 
 Legacy pickles eagerly restore every file and retain mutable workspace trees.
 SQLite keeps cold files on disk; serialized entries isolate request mutations.