cleanup

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: paulr34

src-electron/ide-integration/studio-rest-api.js

@@ -364,22 +364,12 @@ async function wsMessageHandler(db, session, message) {
         )}`
       )
       let parsedTree = null
-      if (typeof resp.tree === 'string') {
-        try {
-          parsedTree = JSON.parse(resp.tree)
-        } catch (e) {
-          parsedTree = null
-        }
-      } else if (
-        Array.isArray(resp.tree) ||
-        (resp.tree && typeof resp.tree === 'object')
-      ) {
-        parsedTree = resp.tree
+      try {
+        parsedTree = JSON.parse(resp.tree)
+      } catch (e) {
+        parsedTree = null
       }
-      sendSelectedUcComponents(db, session, {
-        tree: parsedTree,
-        delta: resp.delta == null ? null : resp.delta
-      })
+      sendSelectedUcComponents(db, session, parsedTree)
     }
   } catch (error) {
     env.logError(

src/store/zap/actions.js

@@ -296,14 +296,13 @@ export function updateSelectedComponent(context, payload) {
     // WS messages can spuriously mark just-installed components as
     // isSelected:false during settle, which used to make the missing-component
     // warning flicker back. We trust two things:
-    //   1. The component ids Studio returned 2xx for (mirrored into
-    //      selectedUcComponents).
+    //   1. The component ids Studio returned 2xx (or its "fake-ok" 4xx with
+    //      componentAdded/componentRemoved) for, mirrored into
+    //      selectedUcComponents.
     //   2. The cluster id we just acted on -- recorded here directly so the
     //      missing-component check can short-circuit regardless of any
     //      id-format mismatches between POST responses and Studio's tree.
     const list = Array.isArray(response?.data) ? response.data : []
-    const httpOk =
-      Number(response?.status) >= 200 && Number(response?.status) < 300
     const successIds = list
       .filter((r) => {
         const s = Number(r?.status)
@@ -320,15 +319,12 @@ export function updateSelectedComponent(context, payload) {
         added: payload.added === true,
         ids: successIds
       })
-    }
-    // Cluster-level bookkeeping for the warning gate. Use the clusterId the
-    // user (or UI) targeted. successIds may be empty when Studio fast-paths
-    // an "already installed" reply, so we don't predicate this on them.
-    if (payload?.clusterId != null && (httpOk || successIds.length)) {
-      context.commit('markClusterInstallRequested', {
-        clusterId: payload.clusterId,
-        added: payload.added === true
-      })
+      if (payload?.clusterId != null) {
+        context.commit('markClusterInstallRequested', {
+          clusterId: payload.clusterId,
+          added: payload.added === true
+        })
+      }
     }
     return response
   })
@@ -1330,21 +1326,17 @@ export function updateUcComponentState(context, projectInfo) {
 
 /**
  * Update the selected UC component state for Simplicity Studio.
+ *
+ * Driven by Studio's "updateComponents" WebSocket notification. The backend
+ * forwards the parsed component tree; we flatten it to leaves and let the
+ * mutation merge them into our local state.
+ *
  * @param {*} context
- * @param {*} projectInfo
+ * @param {*} tree Parsed Studio component tree.
  */
-export function updateSelectedUcComponentState(context, payload) {
-  // Backward compat: older backends sent the raw tree as the payload.
-  let tree = null
-  let delta = null
-  if (Array.isArray(payload)) {
-    tree = payload
-  } else if (payload && typeof payload === 'object') {
-    tree = payload.tree == null ? null : payload.tree
-    delta = payload.delta == null ? null : payload.delta
-  }
+export function updateSelectedUcComponentState(context, tree) {
   const treeLeaves = tree ? Util.getUcComponents(tree) : []
-  context.commit('applyUcComponentUpdate', { treeLeaves, delta })
+  context.commit('applyUcComponentUpdate', treeLeaves)
 }
 
 /**

src/store/zap/mutations.js

@@ -989,28 +989,26 @@ export function updateSelectedUcComponentState(state, data) {
 /**
  * Apply a Studio WebSocket UC component update.
  *
- * Studio's "updateComponents" notification carries both a full `tree` snapshot
- * and a `delta` of what just changed. After a successful install, Studio has
- * been observed to emit a follow-up snapshot that re-marks the just-installed
- * leaf with isSelected:false, which previously caused the missing-component
- * warning to flicker back.
+ * Studio's "updateComponents" notification carries a full tree snapshot. After
+ * a successful install, Studio has been observed to emit a follow-up snapshot
+ * that re-marks the just-installed leaf with isSelected:false, which used to
+ * make the missing-component warning flicker back.
  *
- * ZAP is therefore the authoritative source for its own selection set:
- *   - tree/delta leaves with isSelected:true  -> upserted (Studio can ADD)
- *   - tree/delta leaves with isSelected:false -> ignored (Studio cannot remove)
- *   - leaves not mentioned at all             -> left alone (no wipe)
+ * The fix is to treat Studio's WS updates as ADD-ONLY for the local selection
+ * set:
+ *   - leaves with isSelected:true  -> upserted (Studio can ADD)
+ *   - leaves with isSelected:false -> ignored  (Studio cannot remove)
+ *   - leaves not mentioned at all  -> left alone (no wipe)
  *
- * Removals happen only via applyLocalUcComponentChange when ZAP itself issues
- * a remove POST and Studio responds 2xx. ucComponents (the catalog used for
+ * Removals happen only via locallyMarkUcComponents when ZAP itself issues a
+ * remove POST and Studio responds 2xx. ucComponents (the catalog used for
  * labels / metadata) is always merged so we keep accumulating entries.
  *
  * @param {*} state
- * @param {{ treeLeaves: any[], delta: any }} payload
+ * @param {any[]} treeLeaves Flattened list of leaf nodes from Studio's tree.
  */
-export function applyUcComponentUpdate(state, payload) {
-  if (!payload) return
-  const treeLeaves = Array.isArray(payload.treeLeaves) ? payload.treeLeaves : []
-  const delta = payload.delta
+export function applyUcComponentUpdate(state, treeLeaves) {
+  const leaves = Array.isArray(treeLeaves) ? treeLeaves : []
 
   const prevSelected = Array.isArray(state.studio.selectedUcComponents)
     ? state.studio.selectedUcComponents
@@ -1026,69 +1024,7 @@ export function applyUcComponentUpdate(state, payload) {
     prevAll.filter((x) => x && x.id != null).map((x) => [String(x.id), x])
   )
 
-  /**
-   * Upsert a component into the selected and catalog maps for this mutation.
-   * @param {*} id Component id to add.
-   * @param {*} node Optional node payload to store; falls back to a stub.
-   */
-  function applyAdded(id, node) {
-    if (id == null) return
-    const key = String(id)
-    selectedById.set(key, node || { id: key, isSelected: true })
-    if (node) allById.set(key, node)
-  }
-
-  // Studio's WebSocket updates are ADD-ONLY for selectedUcComponents.
-  //
-  // Background: after we POST a component install, Studio sometimes emits a
-  // follow-up "updateComponents" tree where the freshly-installed leaf has
-  // isSelected:false. We don't know whether that's a bona-fide Studio bug or
-  // a settle artifact (a recomputed snapshot from a stale internal source);
-  // either way the result is the missing-component warning flickering back.
-  //
-  // To make ZAP authoritative for its own POST results we accept Studio's
-  // tree/delta as evidence that a component IS selected, but we never let it
-  // unselect a component. Removals happen only via locallyMarkUcComponents
-  // when ZAP itself POSTs a remove and gets a 2xx back.
-  if (delta) {
-    if (Array.isArray(delta)) {
-      for (const entry of delta) {
-        if (!entry) continue
-        if (typeof entry === 'string') {
-          applyAdded(entry, null)
-        } else if (typeof entry === 'object') {
-          const id = entry.id != null ? entry.id : entry.componentId
-          const sel =
-            entry.isSelected != null
-              ? entry.isSelected
-              : entry.selected != null
-                ? entry.selected
-                : entry.installed != null
-                  ? entry.installed
-                  : null
-          if (sel === true) applyAdded(id, entry)
-          else if (entry.action === 'add' || entry.action === 'added')
-            applyAdded(id, entry)
-        }
-      }
-    } else if (typeof delta === 'object') {
-      const added = [].concat(
-        delta.added || [],
-        delta.installed || [],
-        delta.selected || []
-      )
-      for (const item of added) {
-        if (item == null) continue
-        if (typeof item === 'string') applyAdded(item, null)
-        else if (typeof item === 'object')
-          applyAdded(item.id != null ? item.id : item.componentId, item)
-      }
-    }
-  }
-
-  // Tree merge: add isSelected:true leaves, ignore isSelected:false. Always
-  // merge into the ucComponents catalog so labels/metadata stay fresh.
-  for (const node of treeLeaves) {
+  for (const node of leaves) {
     if (!node || node.id == null) continue
     const key = String(node.id)
     allById.set(key, node)