@buoy-gg/network 7.0.34 → 7.0.36

package/lib/commonjs/network/components/NetworkCopySettingsView.js

@@ -726,13 +726,13 @@ const styles = _reactNative.StyleSheet.create({
     maxHeight: 300
   },
   markdownText: {
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     fontSize: 11,
     color: _sharedUi.macOSColors.text.primary,
     lineHeight: 18
   },
   plaintextText: {
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     fontSize: 11,
     color: _sharedUi.macOSColors.text.primary,
     lineHeight: 18

package/lib/commonjs/network/components/NetworkEventDetailView.js

@@ -870,12 +870,12 @@ const styles = _reactNative.StyleSheet.create({
   urlPath: {
     color: _sharedUi.night.color.textSecondary,
     fontSize: 11,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   urlQueryString: {
     color: _sharedUi.night.color.info,
     fontSize: 11,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   // Query Parameters - Collapsible section
   queryParamsCollapsible: {
@@ -952,7 +952,7 @@ const styles = _reactNative.StyleSheet.create({
   sizeValue: {
     color: _sharedUi.night.color.info,
     fontSize: 10,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     fontWeight: "600"
   },
   /* ---- Timing phases ---- */
@@ -997,7 +997,7 @@ const styles = _reactNative.StyleSheet.create({
     width: 72,
     textAlign: "right",
     fontSize: 12,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     color: _sharedUi.night.color.text
   },
   // Collapsible section styles
@@ -1033,7 +1033,7 @@ const styles = _reactNative.StyleSheet.create({
   collapsibleCount: {
     color: _sharedUi.night.color.textTertiary,
     fontSize: 11.5,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   collapsibleContent: {
     padding: 12
@@ -1107,7 +1107,7 @@ const styles = _reactNative.StyleSheet.create({
   filterOptionValue: {
     color: _sharedUi.night.color.text,
     fontSize: 13,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   filterToggle: {
     paddingHorizontal: 10,

package/lib/commonjs/network/components/NetworkEventItemCompact.js

@@ -319,7 +319,7 @@ const styles = _reactNative.StyleSheet.create({
     fontSize: 12,
     color: _sharedUi.night.color.text,
     lineHeight: 16,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   rightSection: {
     flexDirection: "row",
@@ -334,7 +334,7 @@ const styles = _reactNative.StyleSheet.create({
   bottomRightText: {
     fontSize: 9,
     color: _sharedUi.night.color.textTertiary,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   statusBadge: {
     paddingHorizontal: 4,
@@ -390,7 +390,7 @@ const styles = _reactNative.StyleSheet.create({
   sizeText: {
     fontSize: 8,
     color: _sharedUi.night.color.textSecondary,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   clientText: {
     fontSize: 8,

package/lib/commonjs/network/components/NetworkFilterViewV3.js

@@ -388,7 +388,7 @@ const styles = _reactNative.StyleSheet.create({
   },
   modeBadgeText: {
     fontSize: 9,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     fontWeight: "700",
     letterSpacing: 0.5
   },
@@ -402,7 +402,7 @@ const styles = _reactNative.StyleSheet.create({
     fontSize: 11,
     fontWeight: "600",
     color: _sharedUi.night.color.textSecondary,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     letterSpacing: 0.3
   },
   modeToggleGroup: {
@@ -428,7 +428,7 @@ const styles = _reactNative.StyleSheet.create({
     fontSize: 11,
     fontWeight: "700",
     color: _sharedUi.night.color.textSecondary,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     letterSpacing: 0.3
   },
   modeToggleButtonTextActive: {

package/lib/commonjs/network/components/NetworkHeaderLive.js

@@ -331,7 +331,7 @@ const styles = _reactNative.StyleSheet.create({
   headerChipValue: {
     fontSize: 12,
     fontWeight: "600",
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   headerActionButton: {
     width: 32,
@@ -370,6 +370,6 @@ const styles = _reactNative.StyleSheet.create({
     color: _sharedUi.night.color.onAccent,
     fontSize: 9,
     fontWeight: "700",
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   }
 });

package/lib/commonjs/network/components/NetworkListScreen.js

@@ -371,7 +371,7 @@ const styles = _reactNative.StyleSheet.create({
     fontSize: 10,
     fontWeight: "700",
     letterSpacing: 0.6,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   pinnedClear: {
     paddingHorizontal: 6,

package/lib/commonjs/network/components/NetworkOverrideEditor.js

@@ -681,7 +681,7 @@ const styles = _reactNative.StyleSheet.create({
     paddingVertical: 8,
     color: _sharedUi.macOSColors.text.primary,
     fontSize: 12,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     minHeight: 40
   },
   bodyInput: {

package/lib/commonjs/network/components/NetworkOverridesScreen.js

@@ -493,7 +493,7 @@ const styles = _reactNative.StyleSheet.create({
     fontSize: 12,
     color: _sharedUi.macOSColors.text.primary,
     lineHeight: 16,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   urlTextOff: {
     color: _sharedUi.macOSColors.text.muted

package/lib/commonjs/network/components/NetworkSavedScreen.js

@@ -181,7 +181,7 @@ const styles = _reactNative.StyleSheet.create({
     fontSize: 10,
     fontWeight: "700",
     letterSpacing: 0.6,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   toolbarButton: {
     width: 26,

package/lib/commonjs/network/components/response-editor/Explorer.js

@@ -540,7 +540,7 @@ const styles = _reactNative.StyleSheet.create({
   clearButtonText: {
     fontSize: 12,
     fontWeight: "700",
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   expanderIcon: {
     width: 18,
@@ -627,7 +627,7 @@ const styles = _reactNative.StyleSheet.create({
     fontSize: 10,
     fontWeight: "600",
     marginRight: 4,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     letterSpacing: 0.4
   },
   labelTextFocused: {
@@ -643,14 +643,14 @@ const styles = _reactNative.StyleSheet.create({
     color: _sharedUi.buoyColors.textMuted,
     fontSize: 10,
     fontWeight: "400",
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     opacity: 0.7
   },
   pageRangeText: {
     color: _sharedUi.buoyColors.textSecondary,
     fontSize: 10,
     fontWeight: "600",
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   flexRowGapItemsCenter: {
     flexDirection: "row",
@@ -708,11 +708,11 @@ const styles = _reactNative.StyleSheet.create({
   textNumber: {
     color: _sharedUi.buoyColors.text,
     fontWeight: "600",
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   textString: {
     color: _sharedUi.buoyColors.text,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   flexRowGapFullWidth: {
     flexDirection: "row",
@@ -729,7 +729,7 @@ const styles = _reactNative.StyleSheet.create({
     fontWeight: "600",
     fontSize: 9,
     minWidth: 50,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     letterSpacing: 0.4,
     opacity: 0.8
   },
@@ -783,7 +783,7 @@ const styles = _reactNative.StyleSheet.create({
     flex: 1,
     color: _sharedUi.buoyColors.text,
     fontWeight: "400",
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     fontSize: 12,
     paddingVertical: 6,
     paddingHorizontal: 10,
@@ -839,7 +839,7 @@ const styles = _reactNative.StyleSheet.create({
   readOnlyValue: {
     color: _sharedUi.buoyColors.text,
     fontSize: 13,
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     paddingVertical: 8,
     paddingHorizontal: 12,
     borderRadius: 6,
@@ -865,7 +865,7 @@ const styles = _reactNative.StyleSheet.create({
     marginLeft: 8,
     color: _sharedUi.buoyColors.warning,
     fontWeight: "500",
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   modernToggleButton: {
     flexDirection: "row",
@@ -904,7 +904,7 @@ const styles = _reactNative.StyleSheet.create({
     color: "#E5E7EB",
     fontSize: 11,
     fontWeight: "600",
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     letterSpacing: 0.3
   },
   toggleStatus: {
@@ -923,7 +923,7 @@ const styles = _reactNative.StyleSheet.create({
     fontWeight: "700",
     textTransform: "uppercase",
     letterSpacing: 0.8,
-    fontFamily: "monospace"
+    fontFamily: _sharedUi.monoFont
   },
   // Pre-computed toggle icon styles to avoid inline objects [[memory:4875251]]
   toggleIconTrue: {
@@ -962,7 +962,7 @@ const styles = _reactNative.StyleSheet.create({
     color: _sharedUi.buoyColors.textSecondary,
     fontSize: 10,
     fontWeight: "600",
-    fontFamily: "monospace",
+    fontFamily: _sharedUi.monoFont,
     letterSpacing: 0.4,
     minWidth: 60,
     flexShrink: 0

package/lib/commonjs/network/sync/networkSyncAdapter.js

@@ -311,13 +311,116 @@ base) {
     headers: rule.headers && typeof rule.headers === "object" ? rule.headers : base?.headers,
     // Objects are accepted and serialized so a caller can send JSON directly
     // instead of pre-stringifying it, which is the mistake everyone makes once.
-    body: typeof rule.body === "string" ? rule.body : rule.body != null ? JSON.stringify(rule.body, null, 2) : base?.body,
+    body: patchedBody(rule, base),
     failKind: rule.failKind === "timeout" ? "timeout" : undefined,
     delayMs: typeof rule.delayMs === "number" ? rule.delayMs : undefined,
     times: typeof rule.times === "number" ? rule.times : null,
     alternate: rule.alternate === true
   };
 }
+const isPlainObject = v => !!v && typeof v === "object" && !Array.isArray(v);
+/**
+ * Objects merge key by key; arrays and primitives are replaced. Collects two
+ * dangers instead of writing them: `shrunk` (a non-empty array shorter than
+ * the one it replaces) and `breaks` (an array/object field overwritten by null
+ * or a primitive — the shape the app renders, changed out from under it). The
+ * handler refuses either unless forced.
+ *
+ * This stays local while the typed-edit RULE is shared: it is the merge itself,
+ * not the check, and it reports network-specific dangers the store surfaces do
+ * not have. `shapeKind` comes from the shared module so both agree on what
+ * counts as an array.
+ */
+function deepMerge(base, patch, path = "", issues = {
+  shrunk: [],
+  breaks: []
+}) {
+  if (Array.isArray(base) && Array.isArray(patch)) {
+    if (patch.length > 0 && patch.length < base.length) {
+      issues.shrunk.push({
+        path: path || "(root)",
+        have: base.length,
+        sent: patch.length
+      });
+    }
+    return patch;
+  }
+  if (!isPlainObject(base) || !isPlainObject(patch)) return patch;
+  const out = {
+    ...base
+  };
+  for (const [k, v] of Object.entries(patch)) {
+    const p = path ? `${path}.${k}` : k;
+    if (k in base) {
+      const from = (0, _sharedUi.shapeKind)(base[k]);
+      const to = (0, _sharedUi.shapeKind)(v);
+      if ((from === "array" || from === "object") && from !== to) {
+        issues.breaks.push({
+          path: p,
+          from,
+          to
+        });
+      }
+      out[k] = deepMerge(base[k], v, p, issues);
+    } else {
+      out[k] = v;
+    }
+  }
+  return out;
+}
+
+/** Typed-edit violations a bodyPatch would cause against the seed body, or []. */
+function patchViolations(rule, seed) {
+  if (rule.body != null || !isPlainObject(rule.bodyPatch) || typeof seed !== "string") return [];
+  try {
+    return (0, _sharedUi.typedEditViolations)(JSON.parse(seed), rule.bodyPatch, {
+      noun: "response body"
+    });
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * The rule's body: explicit `body` wins, else `bodyPatch` deep-merged into the
+ * seeded body (from `fromRequestId`, or the rule being replaced), else the seed.
+ *
+ * `bodyPatch` exists for the same reason `setQueryData` has `merge`: a remote
+ * caller reads the real response through a wire that truncates big payloads,
+ * edits one field, and pastes the torn object back as `body`. The app then
+ * renders a response missing half its fields. With a patch the caller sends
+ * `{ stats: [...] }` and the other 30KB stay exactly as the server sent them.
+ */
+function patchedBody(rule, base) {
+  if (typeof rule.body === "string") return rule.body;
+  if (rule.body != null) return JSON.stringify(rule.body, null, 2);
+  const seed = base?.body ?? (typeof rule.id === "string" ? _overrideRulesStore.overrideRulesStore.getState().rules.find(r => r.id === rule.id)?.body : undefined);
+  if (isPlainObject(rule.bodyPatch) && typeof seed === "string") {
+    try {
+      return JSON.stringify(deepMerge(JSON.parse(seed), rule.bodyPatch), null, 2);
+    } catch {
+      return seed;
+    }
+  }
+  return seed;
+}
+
+/**
+ * Replacing a rule by id inherits every field the caller did not send, so a
+ * remote driver can flip one thing — `{ id, bodyPatch }`, `{ id, status: 500 }`
+ * — without re-sending the urlPattern it never had to know.
+ */
+function existingRule(params) {
+  if (!params || typeof params !== "object") return null;
+  const raw = params.rule ?? params;
+  if (!raw || typeof raw !== "object") return null;
+  const id = raw.id;
+  if (typeof id !== "string") return null;
+  const existing = _overrideRulesStore.overrideRulesStore.getState().rules.find(r => r.id === id);
+  return existing ? {
+    ...existing
+  } : null;
+}
 
 /**
  * The body a remote surface never received, when it says so.
@@ -511,7 +614,89 @@ const networkSyncAdapter = exports.networkSyncAdapter = {
     },
     /** Create a rule, or replace one by id. */
     upsertOverrideRule: params => {
-      const base = baseFromRequest(params) ?? preservedBody(params);
+      const base = baseFromRequest(params) ?? preservedBody(params) ?? existingRule(params);
+      const rawRule = params?.rule ?? params;
+      // `bodyPath` + `bodyValue` are sugar over `bodyPatch`, resolved against the
+      // real response before anything else looks at the rule — so the keyed
+      // expansion, the typed-edit guard and the merge below all run on an
+      // ordinary patch and gain no special cases. This is the same form the
+      // state tools take; it exists here because a response body is the surface
+      // where the caller is LEAST likely to have seen the shape (it read the
+      // body over a wire that truncates at 24,000 characters), and therefore
+      // most likely to get the nesting wrong.
+      if (rawRule && typeof rawRule.bodyPath === "string" && rawRule.body == null) {
+        const seed = base?.body ?? (typeof rawRule.id === "string" ? _overrideRulesStore.overrideRulesStore.getState().rules.find(r => r.id === rawRule.id)?.body : undefined);
+        if (typeof seed !== "string") {
+          return {
+            ok: false,
+            error: "bodyPath needs something to patch: send fromRequestId (the captured request whose real response it addresses) or the id of an existing rule."
+          };
+        }
+        if (rawRule.bodyValue === undefined) {
+          return {
+            ok: false,
+            error: `Refused: sent \`bodyPath\` without \`bodyValue\`. Say what to set "${rawRule.bodyPath}" to.`
+          };
+        }
+        let parsed;
+        try {
+          parsed = JSON.parse(seed);
+        } catch {
+          return {
+            ok: false,
+            error: "The captured response body is not JSON, so it cannot be addressed by path. Send a whole `body` instead."
+          };
+        }
+        const built = (0, _sharedUi.patchFromPath)(parsed, rawRule.bodyPath, rawRule.bodyValue);
+        if (!built.ok) return {
+          ok: false,
+          error: `Refused: ${built.error}`
+        };
+        rawRule.bodyPatch = built.patch;
+        delete rawRule.bodyPath;
+        delete rawRule.bodyValue;
+      }
+      if (rawRule && isPlainObject(rawRule.bodyPatch) && rawRule.body == null) {
+        const seed = base?.body ?? (typeof rawRule.id === "string" ? _overrideRulesStore.overrideRulesStore.getState().rules.find(r => r.id === rawRule.id)?.body : undefined);
+        if (typeof seed !== "string") {
+          return {
+            ok: false,
+            error: "bodyPatch needs something to patch: send fromRequestId (the captured request whose real response the patch is merged into) or the id of an existing rule."
+          };
+        }
+        if (rawRule.force !== true) {
+          // Address list items in the real response by their own id rather than
+          // resending the array: {results:{pikachu:{name:"test123"}}}. Expanded
+          // against the seed BEFORE the guard and before the merge, so the
+          // typed-edit rule still holds over the result. This is the only form
+          // that is correct when the caller read the response through a wire
+          // that truncated it — see packages/shared/src/sync/keyedArrays.ts.
+          let keyedError;
+          try {
+            const expanded = (0, _sharedUi.expandKeyedArrays)(JSON.parse(seed), rawRule.bodyPatch);
+            keyedError = expanded.error;
+            if (expanded.notes.length) rawRule.bodyPatch = expanded.patch;
+          } catch {
+            /* a non-JSON seed has no lists to address; leave the patch alone */
+          }
+          // See keyedArrays.ts: an added item whose id disagrees with the key
+          // it was sent under is ambiguous, and only this layer can say so.
+          if (keyedError) {
+            return {
+              ok: false,
+              error: `Refused: ${keyedError}`
+            };
+          }
+          const violations = patchViolations(rawRule, seed);
+          if (violations.length > 0) {
+            return {
+              ok: false,
+              error: (0, _sharedUi.refusalText)(violations, "response body", (0, _sharedUi.suggestedPatch)(rawRule.bodyPatch, violations)),
+              violations
+            };
+          }
+        }
+      }
       const draft = readRuleDraft(params, base);
       if (!draft) {
         const wanted = params?.fromRequestId;
@@ -541,8 +726,19 @@ const networkSyncAdapter = exports.networkSyncAdapter = {
           enabled: rule.enabled,
           kind: rule.kind,
           status: rule.status,
+          times: rule.times,
           bodySize: rule.body ? rule.body.length : 0
         },
+        // A rule with no budget overrides EVERY matching request until someone
+        // deletes it, and that is rarely what a one-off ask meant. Measured on
+        // `api-sim/next-call-fails-once` ("just the next one, then let it work
+        // again"): ten of fourteen attempts left the budget off and got a rule
+        // that never expires. Saying so is not a nag — it is the difference
+        // between a caller that adds `times` on its next turn and one that walks
+        // away leaving the app permanently broken.
+        ...(rule.times === undefined || rule.times === null ? {
+          lingers: `This rule has no \`times\` budget, so it overrides EVERY matching request until it is disabled or deleted (id \`${rule.id}\`). If you meant only the next one, set times:1.`
+        } : {}),
         ...inactiveStamp()
       };
     },