chore: merge origin/main into mintlify/af82bda4 and resolve conflicts

integrations/deepseek-plugin/tests/scoping.test.ts

@@ -0,0 +1,44 @@
+import { describe, it, expect } from "vitest";
+import { resolveSearchFilters, resolveAddParams } from "../src/scoping.ts";
+
+describe("resolveSearchFilters (snake_case, for filters)", () => {
+  it("falls back to the configured default userId", () => {
+    expect(resolveSearchFilters({}, "default-user")).toEqual({ user_id: "default-user" });
+  });
+
+  it("lets a per-call userId override the default", () => {
+    expect(resolveSearchFilters({ userId: "alice" }, "default-user")).toEqual({
+      user_id: "alice",
+    });
+  });
+
+  it("treats a blank/whitespace userId as absent and falls back", () => {
+    expect(resolveSearchFilters({ userId: "   " }, "default-user")).toEqual({
+      user_id: "default-user",
+    });
+  });
+
+  it("includes snake_case agent/run scope only when provided", () => {
+    expect(
+      resolveSearchFilters({ userId: "alice", agentId: "agent-1", runId: "run-9" }, "d"),
+    ).toEqual({ user_id: "alice", agent_id: "agent-1", run_id: "run-9" });
+  });
+
+  it("omits blank agent/run scope", () => {
+    const f = resolveSearchFilters({ agentId: "  ", runId: "run-9" }, "default");
+    expect(f).toEqual({ user_id: "default", run_id: "run-9" });
+    expect(f).not.toHaveProperty("agent_id");
+  });
+});
+
+describe("resolveAddParams (camelCase, for top-level add params)", () => {
+  it("uses camelCase keys and falls back to the default userId", () => {
+    expect(resolveAddParams({}, "default-user")).toEqual({ userId: "default-user" });
+  });
+
+  it("includes camelCase agent/run scope only when provided", () => {
+    expect(
+      resolveAddParams({ userId: "alice", agentId: "agent-1", runId: "run-9" }, "d"),
+    ).toEqual({ userId: "alice", agentId: "agent-1", runId: "run-9" });
+  });
+});