fix resolver identifier detection and hook defaults

Author: Coding-Dev-Tools

engraphis/core/resolve.py

@@ -600,15 +600,9 @@ def _has_subject_identifier_drift(candidate_text: str, record_text: str) -> bool
             continue
         if any(_value_kind(value) != "num" for value in [*old_values, *new_values]):
             continue
-        old_prefix = {
-            candidate[index][0]
-            for index in range(max(0, old_span[0] - 2), old_span[0])
-        }
-        new_prefix = {
-            record[index][0]
-            for index in range(max(0, new_span[0] - 2), new_span[0])
-        }
-        if old_prefix & new_prefix & _SUBJECT_IDENTIFIER_LABELS:
+        old_label = candidate[old_span[0] - 1][0] if old_span[0] else ""
+        new_label = record[new_span[0] - 1][0] if new_span[0] else ""
+        if old_label == new_label and old_label in _SUBJECT_IDENTIFIER_LABELS:
             return True
     return False
 

integrations/commandcode/session_start_hook.py

@@ -106,8 +106,7 @@ def post(url, payload, timeout, session_id=None):
     return (responses[-1] if responses else None), response_session_id
 
 
-def rpc(method, params, rpc_id, deadline, session_id=None,
-         url=MCP_URL_DEFAULT):
+def rpc(method, params, rpc_id, deadline, session_id=None, url=None):
     """Issue one JSON-RPC request within the shared time budget.
 
     ``session_id`` is threaded into the Mcp-Session-Id header on every
@@ -116,6 +115,8 @@ def rpc(method, params, rpc_id, deadline, session_id=None,
     is the canonical case), the returned id is propagated so the caller
     threads it into every subsequent request on the same session.
     """
+    if url is None:
+        url = MCP_URL
     remaining = deadline - time.monotonic()
     if remaining <= 0.05:
         raise TimeoutError("time budget exhausted")
@@ -136,9 +137,10 @@ def rpc(method, params, rpc_id, deadline, session_id=None,
     return None, next_session_id
 
 
-def notify_initialized(deadline, session_id=None,
-                     url=MCP_URL_DEFAULT):
+def notify_initialized(deadline, session_id=None, url=None):
     """Best-effort notifications/initialized; stateless servers reply 202/empty."""
+    if url is None:
+        url = MCP_URL
     remaining = deadline - time.monotonic()
     if remaining <= 0.05:
         return session_id
@@ -171,14 +173,16 @@ def extract_context(result):
     return ""
 
 
-def session_context(repo, workspace, deadline, mcp_url=MCP_URL_DEFAULT):
+def session_context(repo, workspace, deadline, mcp_url=None):
     """initialize -> initialized -> tools/call engraphis_session(action=start).
 
     The Mcp-Session-Id returned by initialize is threaded into every
     subsequent request so a stateful transport (e.g. the dashboard /mcp
     endpoint) keeps the connection open and recognises the tool call as
     part of the same session.
     """
+    if mcp_url is None:
+        mcp_url = MCP_URL
     _, session_id = rpc(
         "initialize",
         {
@@ -243,9 +247,9 @@ def build_additional_context(context, workspace, max_context_chars=None):
 
 
 def main():
-    mcp_url = os.environ.get("ENGRAPHIS_MCP_URL") or MCP_URL_DEFAULT
-    budget_seconds = _env_float("ENGRAPHIS_HOOK_BUDGET_S", BUDGET_SECONDS_DEFAULT)
-    max_context_chars = _env_int("ENGRAPHIS_HOOK_MAX_CHARS", MAX_CONTEXT_CHARS_DEFAULT)
+    mcp_url = os.environ.get("ENGRAPHIS_MCP_URL") or MCP_URL
+    budget_seconds = _env_float("ENGRAPHIS_HOOK_BUDGET_S", BUDGET_SECONDS)
+    max_context_chars = _env_int("ENGRAPHIS_HOOK_MAX_CHARS", MAX_CONTEXT_CHARS)
     deadline = time.monotonic() + budget_seconds
     try:
         payload = json.loads(sys.stdin.read() or "{}")

tests/test_resolve.py

@@ -374,6 +374,14 @@ def test_numeric_subject_identifier_drift_does_not_invalidate():
     assert res.target_id == "mem_account_100"
 
 
+def test_numeric_value_after_non_identifier_label_invalidates():
+    """A changed timeout value must not be mistaken for subject identity drift."""
+    neighbor = _rec("Server timeout is 30 seconds.", id="mem_timeout_30")
+    res = resolve("Server timeout is 60 seconds.", [(0.9, neighbor)])
+    assert res.op == ResolutionOp.INVALIDATE
+    assert res.target_id == "mem_timeout_30"
+
+
 def test_named_identifier_swap_is_not_proven_a_correction_without_marker():
     # ProviderA -> ProviderB beside 4 -> 8 workers could be parallel infrastructure;
     # the hashing embedder cannot prove the same predicate, so both stay live.