neuron-inspector 1.0.0 → 1.2.0

package/README.md

@@ -102,7 +102,7 @@ Each bridge logs its data directory on startup so you can confirm isolation:
 
 ```
 [bridge] Data directory: /Users/you/.neuron/letschop
-[bridge] Primary mode — WebSocket server on 127.0.0.1:7378
+[bridge] Primary mode — HTTP + WebSocket server on 127.0.0.1:7378
 ```
 
 Data layout:
@@ -157,13 +157,21 @@ The agent calls `neuron_perf_snapshot` and gets back Core Web Vitals, render-blo
 
 ### Monitor and track
 
-> "Watch this collection for new items matching 'logistics'"
+> "Alert me when a 500 hits /api/orders"
 
-`neuron_collection_watch` creates a persistent monitor that alerts when matching content appears.
+`neuron_monitor_create` with `request_match` condition — watches the ring buffers for HTTP requests matching a URL pattern and status range. No tab opened.
 
-> "Show me all opportunities from the last 24 hours"
+> "Alert when a console error matching PaymentFailed appears"
 
-`neuron_opportunity_radar` aggregates alerts from all your monitors into one feed.
+`neuron_monitor_create` with `console_match` condition — watches console logs for matching messages. No tab opened.
+
+> "Trigger actions from a Google Sheet edit"
+
+Every monitor gets a webhook URL. Apps Script calls `POST http://127.0.0.1:7377/hooks/:monitorId` with a JSON payload and the monitor's action chain executes.
+
+> "Watch this page for price drops and auto-screenshot when it triggers"
+
+`neuron_monitor_create` with `price_below` condition and a `screenshot` action. The monitor opens the page, checks the price, and runs the action chain if triggered.
 
 > "Track who mentions our brand across platforms"
 
@@ -411,7 +419,7 @@ Manage and run recipe workflows — purpose-built agents that get better with ev
 
 | Tool | What it does |
 |------|-------------|
-| `neuron_monitor_create` | Create a page monitor |
+| `neuron_monitor_create` | Create a monitor (page, traffic, or console). Returns a webhook URL for external triggers |
 | `neuron_monitor_list` | List all monitors |
 | `neuron_monitor_get` | Get monitor details |
 | `neuron_monitor_update` | Update monitor config |
@@ -420,6 +428,21 @@ Manage and run recipe workflows — purpose-built agents that get better with ev
 | `neuron_monitor_check` | Force an immediate check |
 | `neuron_monitor_alerts` | Get recent alerts |
 
+**Condition types:**
+
+| Type | What it watches | Needs a tab? |
+|------|----------------|--------------|
+| `content_change` | Any change in page content | Yes |
+| `text_appears` | Specific text appears on page | Yes |
+| `text_disappears` | Specific text disappears from page | Yes |
+| `price_below` | Price drops below a threshold | Yes |
+| `new_items` | New items in a list/feed | Yes |
+| `selector_change` | Specific CSS selector content changes | Yes |
+| `request_match` | HTTP requests matching URL pattern, method, status range | No — queries ring buffers |
+| `console_match` | Console messages matching search text and log levels | No — queries ring buffers |
+
+**Inbound webhook:** Every monitor exposes `POST /hooks/:monitorId` on the bridge's HTTP server. External systems (Google Sheets Apps Script, n8n, Zapier, cron jobs) can POST to this endpoint to trigger the monitor's action chain. The webhook URL is returned on creation and shown in the UI.
+
 ### Control Tools (4 tools)
 
 | Tool | What it does |
@@ -537,14 +560,14 @@ npx tsc --noEmit
 
 | File | Purpose |
 |------|---------|
-| `server.ts` | MCP server, WebSocket bridge, tool registration |
+| `server.ts` | MCP server, HTTP + WebSocket bridge, webhook handler, tool registration |
 | `tools.ts` | Browser primitive definitions + name mapping |
 | `compound-tools.ts` | Compound tools (research, search, fill, audit, media) |
 | `business-tools.ts` | 29 business intelligence and developer tools |
 | `recipe-tools.ts` | Recipe management + rules + profile |
 | `scheduler.ts` | Cron-like recipe scheduling |
 | `session-state.ts` | Session state persistence |
-| `monitor.ts` | Page monitoring with alerts |
+| `monitor.ts` | Page, traffic, and console monitoring with alerts and action chains |
 | `killswitch.ts` | Emergency stop, pause, resume |
 | `resilience.ts` | Retry, wait, health check helpers |
 | `correlation.ts` | WebSocket request/response correlation |

package/dist/collections/__tests__/merge.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/collections/__tests__/merge.test.js

@@ -0,0 +1,411 @@
+import { describe, it, expect } from "vitest";
+import { mergeCollections } from "../merge.js";
+function makeCollection(overrides = {}) {
+    return { name: "Base", ...overrides };
+}
+// ── Additive merge (no overlap) ──────────────────────────────────
+describe("additive merge (no overlap)", () => {
+    it("adds new folders from incoming", () => {
+        const base = makeCollection({
+            folders: {
+                auth: { endpoints: [{ name: "Login", method: "POST", path: "/login" }] },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            folders: {
+                orders: { endpoints: [{ name: "List Orders", method: "GET", path: "/orders" }] },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.folders).toHaveProperty("auth");
+        expect(result.collection.folders).toHaveProperty("orders");
+        expect(result.stats.folders_added).toBe(1);
+        expect(result.stats.endpoints_added).toBe(1);
+        expect(result.stats.endpoints_updated).toBe(0);
+    });
+    it("adds new environments from incoming", () => {
+        const base = makeCollection({
+            environments: { dev: { base_url: "http://localhost:3000" } },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            environments: { staging: { base_url: "https://staging.example.com" } },
+        });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.environments).toHaveProperty("dev");
+        expect(result.collection.environments).toHaveProperty("staging");
+        expect(result.stats.environments_added).toBe(1);
+    });
+    it("adds new scenarios from incoming", () => {
+        const base = makeCollection({
+            scenarios: {
+                login: { steps: [{ ref: "auth/POST /login" }] },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            scenarios: {
+                checkout: { steps: [{ ref: "orders/POST /checkout" }] },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.scenarios).toHaveProperty("login");
+        expect(result.collection.scenarios).toHaveProperty("checkout");
+        expect(result.stats.scenarios_added).toBe(1);
+    });
+});
+// ── Endpoint conflict ────────────────────────────────────────────
+describe("endpoint conflict (same method+path)", () => {
+    it("replaces endpoint with incoming version when method+path match", () => {
+        const base = makeCollection({
+            folders: {
+                auth: {
+                    endpoints: [
+                        { name: "Login", method: "POST", path: "/login", body: { email: "old" } },
+                        { name: "Me", method: "GET", path: "/me" },
+                    ],
+                },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            folders: {
+                auth: {
+                    endpoints: [
+                        { name: "Login V2", method: "POST", path: "/login", body: { email: "new", mfa: true } },
+                        { name: "Register", method: "POST", path: "/register" },
+                    ],
+                },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        const authEndpoints = result.collection.folders.auth.endpoints;
+        expect(authEndpoints).toHaveLength(3);
+        const loginEp = authEndpoints.find((ep) => ep.method === "POST" && ep.path === "/login");
+        expect(loginEp.name).toBe("Login V2");
+        expect(loginEp.body).toEqual({ email: "new", mfa: true });
+        expect(result.stats.endpoints_updated).toBe(1);
+        expect(result.stats.endpoints_added).toBe(1);
+    });
+    it("matches endpoints case-insensitively on method", () => {
+        const base = makeCollection({
+            folders: {
+                api: { endpoints: [{ name: "Get Items", method: "get", path: "/items" }] },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            folders: {
+                api: { endpoints: [{ name: "Get Items V2", method: "GET", path: "/items" }] },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.folders.api.endpoints).toHaveLength(1);
+        expect(result.collection.folders.api.endpoints[0].name).toBe("Get Items V2");
+        expect(result.stats.endpoints_updated).toBe(1);
+    });
+});
+// ── Environment deep merge ───────────────────────────────────────
+describe("environment deep merge", () => {
+    it("deep-merges variables and headers within existing environments", () => {
+        const base = makeCollection({
+            environments: {
+                dev: {
+                    base_url: "http://localhost:3000",
+                    variables: { api_key: "base-key", debug: "true" },
+                    headers: { "X-Custom": "base-value" },
+                },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            environments: {
+                dev: {
+                    base_url: "http://incoming:4000",
+                    variables: { api_key: "incoming-key", version: "2" },
+                    headers: { "X-New": "new-value" },
+                },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        const dev = result.collection.environments.dev;
+        // base_url: base keeps its own (it already has one)
+        expect(dev.base_url).toBe("http://localhost:3000");
+        // variables deep-merged, incoming wins on conflict
+        expect(dev.variables).toEqual({ api_key: "incoming-key", debug: "true", version: "2" });
+        // headers deep-merged
+        expect(dev.headers).toEqual({ "X-Custom": "base-value", "X-New": "new-value" });
+        expect(result.stats.environments_updated).toBe(1);
+    });
+    it("takes base_url from incoming when base env has none", () => {
+        const base = makeCollection({
+            environments: {
+                dev: { base_url: "" },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            environments: {
+                dev: { base_url: "http://incoming:4000" },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        // Empty string is falsy, so incoming wins
+        expect(result.collection.environments.dev.base_url).toBe("http://incoming:4000");
+    });
+});
+// ── Scenario skip ────────────────────────────────────────────────
+describe("scenario merge", () => {
+    it("keeps base scenario when names conflict", () => {
+        const base = makeCollection({
+            scenarios: {
+                login: { steps: [{ ref: "auth/POST /login" }] },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            scenarios: {
+                login: { steps: [{ ref: "auth/POST /login" }, { ref: "auth/GET /me" }] },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        // Base scenario kept (1 step, not 2)
+        expect(result.collection.scenarios.login.steps).toHaveLength(1);
+        expect(result.stats.scenarios_skipped).toBe(1);
+        expect(result.stats.scenarios_added).toBe(0);
+    });
+});
+// ── Defaults deep merge ─────────────────────────────────────────
+describe("defaults merge", () => {
+    it("deep-merges headers and variables, keeps base scalars", () => {
+        const base = makeCollection({
+            defaults: {
+                headers: { Authorization: "Bearer base" },
+                variables: { env: "base" },
+                timeout_ms: 5000,
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            defaults: {
+                headers: { "X-New": "header", Authorization: "Bearer incoming" },
+                variables: { region: "us" },
+                timeout_ms: 10000,
+                auth: { type: "bearer", token: "tok" },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        const defaults = result.collection.defaults;
+        // Headers deep-merged, incoming wins per key
+        expect(defaults.headers).toEqual({ Authorization: "Bearer incoming", "X-New": "header" });
+        // Variables deep-merged
+        expect(defaults.variables).toEqual({ env: "base", region: "us" });
+        // Scalar: base keeps its timeout
+        expect(defaults.timeout_ms).toBe(5000);
+        // Auth: base had none, so take incoming
+        expect(defaults.auth).toEqual({ type: "bearer", token: "tok" });
+    });
+    it("takes incoming defaults wholesale when base has none", () => {
+        const base = makeCollection({});
+        const incoming = makeCollection({
+            name: "Incoming",
+            defaults: {
+                headers: { "X-Test": "val" },
+                timeout_ms: 3000,
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.defaults).toEqual({ headers: { "X-Test": "val" }, timeout_ms: 3000 });
+    });
+    it("returns base defaults unchanged when incoming has none", () => {
+        const base = makeCollection({
+            defaults: { timeout_ms: 5000 },
+        });
+        const incoming = makeCollection({ name: "Incoming" });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.defaults).toEqual({ timeout_ms: 5000 });
+    });
+});
+// ── Stats accuracy ──────────────────────────────────────────────
+describe("stats accuracy", () => {
+    it("counts all operations correctly in a mixed merge", () => {
+        const base = makeCollection({
+            folders: {
+                auth: {
+                    endpoints: [
+                        { name: "Login", method: "POST", path: "/login" },
+                        { name: "Me", method: "GET", path: "/me" },
+                    ],
+                },
+            },
+            environments: { dev: { base_url: "http://localhost" } },
+            scenarios: { "login-flow": { steps: [{ ref: "auth/POST /login" }] } },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            folders: {
+                auth: {
+                    endpoints: [
+                        { name: "Login New", method: "POST", path: "/login" },
+                        { name: "Register", method: "POST", path: "/register" },
+                    ],
+                },
+                orders: {
+                    endpoints: [{ name: "List", method: "GET", path: "/orders" }],
+                },
+            },
+            environments: {
+                dev: { base_url: "http://incoming", variables: { key: "val" } },
+                staging: { base_url: "https://staging.example.com" },
+            },
+            scenarios: {
+                "login-flow": { steps: [{ ref: "auth/POST /login" }, { ref: "auth/GET /me" }] },
+                "order-flow": { steps: [{ ref: "orders/GET /orders" }] },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        expect(result.stats).toEqual({
+            endpoints_added: 2, // POST /register + GET /orders (from new folder)
+            endpoints_updated: 1, // POST /login replaced
+            environments_added: 1, // staging
+            environments_updated: 1, // dev
+            folders_added: 1, // orders
+            scenarios_added: 1, // order-flow
+            scenarios_skipped: 1, // login-flow kept base
+        });
+    });
+});
+// ── Empty collections ───────────────────────────────────────────
+describe("empty collections", () => {
+    it("handles merging two empty collections", () => {
+        const base = makeCollection({});
+        const incoming = makeCollection({ name: "Incoming" });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.name).toBe("Base");
+        expect(result.stats).toEqual({
+            endpoints_added: 0,
+            endpoints_updated: 0,
+            environments_added: 0,
+            environments_updated: 0,
+            folders_added: 0,
+            scenarios_added: 0,
+            scenarios_skipped: 0,
+        });
+        expect(result.conflicts).toHaveLength(0);
+    });
+    it("handles merging into empty base from populated incoming", () => {
+        const base = makeCollection({});
+        const incoming = makeCollection({
+            name: "Incoming",
+            folders: {
+                auth: { endpoints: [{ name: "Login", method: "POST", path: "/login" }] },
+            },
+            environments: { dev: { base_url: "http://localhost" } },
+            scenarios: { flow: { steps: [{ ref: "auth/POST /login" }] } },
+        });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.name).toBe("Base");
+        expect(result.collection.folders).toHaveProperty("auth");
+        expect(result.collection.environments).toHaveProperty("dev");
+        expect(result.collection.scenarios).toHaveProperty("flow");
+        expect(result.stats.folders_added).toBe(1);
+        expect(result.stats.endpoints_added).toBe(1);
+        expect(result.stats.environments_added).toBe(1);
+        expect(result.stats.scenarios_added).toBe(1);
+    });
+    it("returns base unchanged when incoming is empty", () => {
+        const base = makeCollection({
+            folders: {
+                auth: { endpoints: [{ name: "Login", method: "POST", path: "/login" }] },
+            },
+        });
+        const incoming = makeCollection({ name: "Incoming" });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.folders.auth.endpoints).toHaveLength(1);
+        expect(result.stats.endpoints_added).toBe(0);
+        expect(result.stats.endpoints_updated).toBe(0);
+        expect(result.conflicts).toHaveLength(0);
+    });
+});
+// ── Identity and immutability ───────────────────────────────────
+describe("identity preservation", () => {
+    it("keeps base name, version, and active_environment", () => {
+        const base = makeCollection({
+            name: "My API",
+            version: "2.0.0",
+            active_environment: "dev",
+        });
+        const incoming = makeCollection({
+            name: "Their API",
+            version: "3.0.0",
+            active_environment: "staging",
+        });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.name).toBe("My API");
+        expect(result.collection.version).toBe("2.0.0");
+        expect(result.collection.active_environment).toBe("dev");
+    });
+    it("does not mutate the input collections", () => {
+        const base = makeCollection({
+            folders: {
+                auth: { endpoints: [{ name: "Login", method: "POST", path: "/login" }] },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            folders: {
+                auth: { endpoints: [{ name: "Register", method: "POST", path: "/register" }] },
+            },
+        });
+        const baseSnapshot = JSON.stringify(base);
+        const incomingSnapshot = JSON.stringify(incoming);
+        mergeCollections(base, incoming);
+        expect(JSON.stringify(base)).toBe(baseSnapshot);
+        expect(JSON.stringify(incoming)).toBe(incomingSnapshot);
+    });
+});
+// ── Folder-level headers/variables merge ────────────────────────
+describe("folder-level metadata merge", () => {
+    it("deep-merges folder headers and variables", () => {
+        const base = makeCollection({
+            folders: {
+                auth: {
+                    headers: { Authorization: "Bearer base" },
+                    variables: { host: "base-host" },
+                    endpoints: [],
+                },
+            },
+        });
+        const incoming = makeCollection({
+            name: "Incoming",
+            folders: {
+                auth: {
+                    headers: { "X-New": "val", Authorization: "Bearer incoming" },
+                    variables: { version: "2" },
+                    endpoints: [],
+                },
+            },
+        });
+        const result = mergeCollections(base, incoming);
+        const auth = result.collection.folders.auth;
+        expect(auth.headers).toEqual({ Authorization: "Bearer incoming", "X-New": "val" });
+        expect(auth.variables).toEqual({ host: "base-host", version: "2" });
+    });
+});
+// ── Description merge ───────────────────────────────────────────
+describe("description merge", () => {
+    it("takes incoming description when base has none", () => {
+        const base = makeCollection({});
+        const incoming = makeCollection({ name: "Incoming", description: "From incoming" });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.description).toBe("From incoming");
+    });
+    it("keeps base description when both have one", () => {
+        const base = makeCollection({ description: "Base desc" });
+        const incoming = makeCollection({ name: "Incoming", description: "Incoming desc" });
+        const result = mergeCollections(base, incoming);
+        expect(result.collection.description).toBe("Base desc");
+    });
+});
+//# sourceMappingURL=merge.test.js.map

package/dist/collections/__tests__/merge.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.test.js","sourceRoot":"","sources":["../../../src/collections/__tests__/merge.test.ts"],"names":[],"mappings":"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"}

package/dist/collections/index.d.ts

@@ -10,3 +10,5 @@ export { buildDefaultRegistry, DynamicVarRegistry } from "./dynamic-vars.js";
 export { DeclarativeScriptRunner, JsScriptRunner } from "./scripts.js";
 export { executeEndpoint, executeFolder, executeCollection, executeScenario } from "./executor.js";
 export { fromPostmanV21, toPostmanV21 } from "./postman.js";
+export { mergeCollections } from "./merge.js";
+export type { MergeConflict, MergeStats, MergeResult } from "./merge.js";

package/dist/collections/index.js

@@ -24,4 +24,5 @@ export { buildDefaultRegistry, DynamicVarRegistry } from "./dynamic-vars.js";
 export { DeclarativeScriptRunner, JsScriptRunner } from "./scripts.js";
 export { executeEndpoint, executeFolder, executeCollection, executeScenario } from "./executor.js";
 export { fromPostmanV21, toPostmanV21 } from "./postman.js";
+export { mergeCollections } from "./merge.js";
 //# sourceMappingURL=index.js.map

package/dist/collections/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/collections/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAI1E,mEAAmE;AACnE,+CAA+C;AAC/C,+DAA+D;AAE/D,MAAM,KAAK,GAAG,IAAI,mBAAmB,EAAE,CAAC;AACxC,MAAM,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAC7C,MAAM,kBAAkB,GAAG,oBAAoB,EAAE,CAAC;AAClD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,IAAI,gBAAgB,EAAE,CAAC;AAClD,MAAM,YAAY,GAAG,IAAI,cAAc,EAAE,CAAC;AAE1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,oBAAoB,EAAE,CAAC;AACvD,MAAM,CAAC,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;AAuB5H,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/collections/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAI1E,mEAAmE;AACnE,+CAA+C;AAC/C,+DAA+D;AAE/D,MAAM,KAAK,GAAG,IAAI,mBAAmB,EAAE,CAAC;AACxC,MAAM,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAC7C,MAAM,kBAAkB,GAAG,oBAAoB,EAAE,CAAC;AAClD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,IAAI,gBAAgB,EAAE,CAAC;AAClD,MAAM,YAAY,GAAG,IAAI,cAAc,EAAE,CAAC;AAE1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,oBAAoB,EAAE,CAAC;AACvD,MAAM,CAAC,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;AAuB5H,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}

package/dist/collections/merge.d.ts

@@ -0,0 +1,21 @@
+import type { Collection } from "./types.js";
+export interface MergeConflict {
+    path: string;
+    type: "overwritten" | "added" | "skipped";
+    detail: string;
+}
+export interface MergeStats {
+    endpoints_added: number;
+    endpoints_updated: number;
+    environments_added: number;
+    environments_updated: number;
+    folders_added: number;
+    scenarios_added: number;
+    scenarios_skipped: number;
+}
+export interface MergeResult {
+    collection: Collection;
+    conflicts: MergeConflict[];
+    stats: MergeStats;
+}
+export declare function mergeCollections(base: Collection, incoming: Collection): MergeResult;