From 69e153b3dbde0e52a283ca73af2465bd1b893a9f Mon Sep 17 00:00:00 2001
From: Chaim <chaim@marcus-law.co.il>
Date: Mon, 4 May 2026 17:39:17 +0000
Subject: [PATCH] fix(settings/agents): exclude noise from drift detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two false positives surfaced after the Agents tab went live:

1. status (running/idle/paused) is runtime state, not config — drops in
   and out as agents pick up issues. Removed from _DRIFT_FIELDS.

2. desiredSkills compared raw, but local/* and company/* skills carry
   per-company hashes/scopes by design (sync_agents_across_companies.py
   filters local skills with a warning). Comparing them flags every
   master+mirror pair that has any local skill on master.

Now compares only paperclipai/* skills (vendor-shipped, must match).
UI shows an inline note explaining the filter.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../app/settings/_components/agents-tab.tsx   | 25 +++++++++++--------
 web/app.py                                    | 18 ++++++++++++-
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/web-ui/src/app/settings/_components/agents-tab.tsx b/web-ui/src/app/settings/_components/agents-tab.tsx
index e939cd6..22eecc7 100644
--- a/web-ui/src/app/settings/_components/agents-tab.tsx
+++ b/web-ui/src/app/settings/_components/agents-tab.tsx
@@ -336,16 +336,21 @@ export function AgentsTab() {
     <div className="space-y-4">
       <Card className="bg-surface border-rule shadow-sm">
         <CardContent className="px-5 py-4 flex items-center justify-between gap-3 flex-wrap">
-          <div className="text-[0.85rem] text-ink-muted">
-            {data.pairs.length} סוכנים × 2 חברות (CMP master / CMPA mirror)
-            {totalDrift > 0 && (
-              <span className="text-warn ms-2">
-                · {totalDrift} פערי סנכרון
-              </span>
-            )}
-            {missingCount > 0 && (
-              <span className="text-danger ms-2">· {missingCount} זוגות לא שלמים</span>
-            )}
+          <div className="space-y-1">
+            <div className="text-[0.85rem] text-ink-muted">
+              {data.pairs.length} סוכנים × 2 חברות (CMP master / CMPA mirror)
+              {totalDrift > 0 && (
+                <span className="text-warn ms-2">
+                  · {totalDrift} פערי סנכרון
+                </span>
+              )}
+              {missingCount > 0 && (
+                <span className="text-danger ms-2">· {missingCount} זוגות לא שלמים</span>
+              )}
+            </div>
+            <div className="text-[0.7rem] text-ink-light">
+              פערי skills מחושבים על paperclipai/* בלבד. local/* ו-company/* מסוננים — שם שונה בין החברות הוא צפוי.
+            </div>
           </div>
           <Button
             variant="outline"
diff --git a/web/app.py b/web/app.py
index e0150bf..8e6a6f8 100644
--- a/web/app.py
+++ b/web/app.py
@@ -3191,6 +3191,8 @@ _AGENT_NAME_ORDER = {
 }
 
 # Fields that should match between master (CMP) and mirror (CMPA). Drift = bug.
+# `status` is intentionally excluded — it's runtime state (running/idle/paused),
+# not config, and changes constantly.
 _DRIFT_FIELDS = (
     "model",
     "effort",
@@ -3204,10 +3206,21 @@ _DRIFT_FIELDS = (
     "wakeOnDemand",
     "maxConcurrentRuns",
     "budget_monthly_cents",
-    "status",
 )
 
 
+def _portable_skills(skills: list[str]) -> list[str]:
+    """Return only the skills whose drift across companies is meaningful.
+
+    `local/*` skills carry per-install hashes (different IDs per company even
+    when the underlying skill is identical); `company/{cid}/*` skills are
+    scoped to a single company by construction. Both are expected to differ
+    between master and mirror — comparing them produces noise. Only
+    `paperclipai/*` (vendor-shipped) skills should match exactly.
+    """
+    return sorted(s for s in skills if s.startswith("paperclipai/"))
+
+
 def _shape_paperclip_agent(raw: dict, company_id: str, company_name: str) -> dict:
     """Flatten a Paperclip agent row into the shape the UI consumes."""
     ac = raw.get("adapterConfig") or {}
@@ -3252,6 +3265,9 @@ def _compute_drift(master: dict | None, mirror: dict | None) -> list[dict]:
     for field in _DRIFT_FIELDS:
         m_val = master.get(field)
         i_val = mirror.get(field)
+        if field == "desiredSkills":
+            m_val = _portable_skills(m_val or [])
+            i_val = _portable_skills(i_val or [])
         if m_val != i_val:
             drift.append({"field": field, "master": m_val, "mirror": i_val})
     return drift