@malloy-publisher/server 0.0.235 → 0.0.236

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (301) hide show
  1. package/dist/app/api-doc.yaml +47 -17
  2. package/dist/package_load_worker.mjs +8 -1
  3. package/dist/server.mjs +471 -54
  4. package/package.json +5 -2
  5. package/.eslintrc.json +0 -44
  6. package/.prettierignore +0 -1
  7. package/.prettierrc +0 -4
  8. package/build.ts +0 -97
  9. package/eslint.config.mjs +0 -76
  10. package/k6-tests/README.md +0 -144
  11. package/k6-tests/bun.lock +0 -797
  12. package/k6-tests/load-test/load-test-crud-connections.ts +0 -263
  13. package/k6-tests/load-test/load-test-crud-packages.ts +0 -461
  14. package/k6-tests/load-test/load-test-crud-projects.ts +0 -160
  15. package/k6-tests/load-test/load-test-crud.ts +0 -142
  16. package/k6-tests/load-test/load-test.ts +0 -784
  17. package/k6-tests/package.json +0 -27
  18. package/k6-tests/scripts/run-with-otel.sh +0 -50
  19. package/k6-tests/smoke-test/smoke-test.ts +0 -158
  20. package/k6-tests/tsconfig.json +0 -29
  21. package/k6-tests/utils/client_factory.ts +0 -128
  22. package/k6-tests/utils/common.ts +0 -489
  23. package/k6-tests/utils/logger.ts +0 -62
  24. package/k6-tests/utils/types.d.ts +0 -35
  25. package/malloy_mcp.dxt +0 -0
  26. package/publisher.config.example.bigquery.json +0 -33
  27. package/publisher.config.example.duckdb.json +0 -23
  28. package/publisher.config.json +0 -23
  29. package/scripts/bake-duckdb-extensions.js +0 -110
  30. package/src/config.spec.ts +0 -1535
  31. package/src/config.theme.spec.ts +0 -178
  32. package/src/config.ts +0 -1142
  33. package/src/constants.ts +0 -105
  34. package/src/controller/compile.controller.ts +0 -40
  35. package/src/controller/connection.controller.spec.ts +0 -849
  36. package/src/controller/connection.controller.ts +0 -901
  37. package/src/controller/database.controller.ts +0 -24
  38. package/src/controller/materialization.controller.spec.ts +0 -293
  39. package/src/controller/materialization.controller.ts +0 -319
  40. package/src/controller/model.controller.ts +0 -164
  41. package/src/controller/package.controller.spec.ts +0 -273
  42. package/src/controller/package.controller.ts +0 -306
  43. package/src/controller/query.controller.ts +0 -152
  44. package/src/controller/theme.controller.ts +0 -83
  45. package/src/controller/watch-mode.controller.ts +0 -243
  46. package/src/data_styles.ts +0 -71
  47. package/src/default-publisher.config.json +0 -23
  48. package/src/ducklake_version.spec.ts +0 -163
  49. package/src/ducklake_version.ts +0 -153
  50. package/src/errors.spec.ts +0 -119
  51. package/src/errors.ts +0 -237
  52. package/src/filter_deprecation.spec.ts +0 -64
  53. package/src/filter_deprecation.ts +0 -42
  54. package/src/health.spec.ts +0 -123
  55. package/src/health.ts +0 -233
  56. package/src/heap_check.spec.ts +0 -144
  57. package/src/heap_check.ts +0 -144
  58. package/src/instrumentation.ts +0 -214
  59. package/src/json_utils.spec.ts +0 -51
  60. package/src/json_utils.ts +0 -33
  61. package/src/logger.spec.ts +0 -210
  62. package/src/logger.ts +0 -251
  63. package/src/malloy_pin_prereqs.spec.ts +0 -25
  64. package/src/materialization_metrics.spec.ts +0 -169
  65. package/src/materialization_metrics.ts +0 -346
  66. package/src/mcp/error_messages.spec.ts +0 -35
  67. package/src/mcp/error_messages.ts +0 -183
  68. package/src/mcp/handler_utils.spec.ts +0 -108
  69. package/src/mcp/handler_utils.ts +0 -251
  70. package/src/mcp/mcp_constants.ts +0 -6
  71. package/src/mcp/query_envelope.spec.ts +0 -229
  72. package/src/mcp/query_envelope.ts +0 -240
  73. package/src/mcp/server.protocol.spec.ts +0 -250
  74. package/src/mcp/server.ts +0 -87
  75. package/src/mcp/skills/build_skills_bundle.spec.ts +0 -51
  76. package/src/mcp/skills/build_skills_bundle.ts +0 -176
  77. package/src/mcp/skills/skills_bundle.json +0 -1
  78. package/src/mcp/skills/skills_bundle.spec.ts +0 -171
  79. package/src/mcp/tool_response.spec.ts +0 -108
  80. package/src/mcp/tool_response.ts +0 -138
  81. package/src/mcp/tools/compile_tool.spec.ts +0 -315
  82. package/src/mcp/tools/compile_tool.ts +0 -208
  83. package/src/mcp/tools/docs_search/build_docs_index.ts +0 -132
  84. package/src/mcp/tools/docs_search/malloy_docs_index.json +0 -1
  85. package/src/mcp/tools/docs_search_tool.spec.ts +0 -32
  86. package/src/mcp/tools/docs_search_tool.ts +0 -128
  87. package/src/mcp/tools/embedding_index.spec.ts +0 -1236
  88. package/src/mcp/tools/embedding_index.ts +0 -808
  89. package/src/mcp/tools/execute_query_tool.spec.ts +0 -294
  90. package/src/mcp/tools/execute_query_tool.ts +0 -316
  91. package/src/mcp/tools/get_context_eval.ts +0 -275
  92. package/src/mcp/tools/get_context_tool.spec.ts +0 -592
  93. package/src/mcp/tools/get_context_tool.ts +0 -585
  94. package/src/mcp/tools/reload_package_tool.spec.ts +0 -232
  95. package/src/mcp/tools/reload_package_tool.ts +0 -132
  96. package/src/mcp_config.spec.ts +0 -919
  97. package/src/mcp_config.ts +0 -425
  98. package/src/oom_guards.integration.spec.ts +0 -269
  99. package/src/package_load/package_load_pool.spec.ts +0 -252
  100. package/src/package_load/package_load_pool.ts +0 -931
  101. package/src/package_load/package_load_worker.ts +0 -1034
  102. package/src/package_load/protocol.ts +0 -364
  103. package/src/package_load/rpc_wait_accountant.spec.ts +0 -109
  104. package/src/package_load/rpc_wait_accountant.ts +0 -76
  105. package/src/package_load_metrics.spec.ts +0 -114
  106. package/src/package_load_metrics.ts +0 -127
  107. package/src/path_safety.spec.ts +0 -158
  108. package/src/path_safety.ts +0 -146
  109. package/src/pg_helpers.spec.ts +0 -223
  110. package/src/pg_helpers.ts +0 -52
  111. package/src/query_cap_metrics.spec.ts +0 -89
  112. package/src/query_cap_metrics.ts +0 -116
  113. package/src/query_concurrency.spec.ts +0 -247
  114. package/src/query_concurrency.ts +0 -237
  115. package/src/query_metadata_metrics.ts +0 -49
  116. package/src/query_param_utils.ts +0 -29
  117. package/src/query_timeout.spec.ts +0 -224
  118. package/src/query_timeout.ts +0 -179
  119. package/src/runtime/publisher.js +0 -328
  120. package/src/server-old.ts +0 -988
  121. package/src/server.ts +0 -2059
  122. package/src/service/annotations.spec.ts +0 -118
  123. package/src/service/annotations.ts +0 -91
  124. package/src/service/authorize.spec.ts +0 -154
  125. package/src/service/authorize.ts +0 -498
  126. package/src/service/authorize_integration.spec.ts +0 -2041
  127. package/src/service/build_plan.spec.ts +0 -685
  128. package/src/service/build_plan.ts +0 -797
  129. package/src/service/compile_authorize.spec.ts +0 -85
  130. package/src/service/compile_fragment_techniques.spec.ts +0 -156
  131. package/src/service/connection.spec.ts +0 -2360
  132. package/src/service/connection.ts +0 -2187
  133. package/src/service/connection_config.spec.ts +0 -734
  134. package/src/service/connection_config.ts +0 -899
  135. package/src/service/connection_federation.spec.ts +0 -184
  136. package/src/service/connection_fingerprint.spec.ts +0 -102
  137. package/src/service/connection_service.spec.ts +0 -711
  138. package/src/service/connection_service.ts +0 -291
  139. package/src/service/cron_evaluator.spec.ts +0 -79
  140. package/src/service/cron_evaluator.ts +0 -105
  141. package/src/service/db_utils.spec.ts +0 -1085
  142. package/src/service/db_utils.ts +0 -1502
  143. package/src/service/duckdb_instance_isolation.spec.ts +0 -137
  144. package/src/service/ducklake_lazy_attach.spec.ts +0 -110
  145. package/src/service/embedding_provider.spec.ts +0 -329
  146. package/src/service/embedding_provider.ts +0 -236
  147. package/src/service/environment.ts +0 -2191
  148. package/src/service/environment_admission.spec.ts +0 -344
  149. package/src/service/environment_compile.spec.ts +0 -197
  150. package/src/service/environment_store.spec.ts +0 -2274
  151. package/src/service/environment_store.ts +0 -2434
  152. package/src/service/environment_store_anchoring.spec.ts +0 -107
  153. package/src/service/environment_store_clone.spec.ts +0 -350
  154. package/src/service/explore_visibility.spec.ts +0 -434
  155. package/src/service/exports_probe.spec.ts +0 -107
  156. package/src/service/extension_fetch_policy.spec.ts +0 -256
  157. package/src/service/filter.spec.ts +0 -458
  158. package/src/service/filter.ts +0 -341
  159. package/src/service/filter_bypass.spec.ts +0 -418
  160. package/src/service/filter_integration.spec.ts +0 -1004
  161. package/src/service/freshness.spec.ts +0 -183
  162. package/src/service/freshness.ts +0 -112
  163. package/src/service/gcs_s3_utils.ts +0 -427
  164. package/src/service/given.ts +0 -105
  165. package/src/service/givens_integration.spec.ts +0 -219
  166. package/src/service/manifest_loader.spec.ts +0 -189
  167. package/src/service/manifest_loader.ts +0 -156
  168. package/src/service/materialization_build_session.spec.ts +0 -435
  169. package/src/service/materialization_build_session.ts +0 -681
  170. package/src/service/materialization_config_validation.spec.ts +0 -99
  171. package/src/service/materialization_config_validation.ts +0 -120
  172. package/src/service/materialization_eligibility.spec.ts +0 -158
  173. package/src/service/materialization_eligibility.ts +0 -305
  174. package/src/service/materialization_schedule_surface.spec.ts +0 -256
  175. package/src/service/materialization_scheduler.spec.ts +0 -289
  176. package/src/service/materialization_scheduler.ts +0 -304
  177. package/src/service/materialization_serve_transform.spec.ts +0 -1003
  178. package/src/service/materialization_serve_transform.ts +0 -779
  179. package/src/service/materialization_service.spec.ts +0 -2373
  180. package/src/service/materialization_service.ts +0 -2342
  181. package/src/service/materialization_test_fixtures.ts +0 -249
  182. package/src/service/model.spec.ts +0 -1157
  183. package/src/service/model.ts +0 -3370
  184. package/src/service/model_limits.spec.ts +0 -209
  185. package/src/service/model_limits.ts +0 -131
  186. package/src/service/model_storage_serve.spec.ts +0 -193
  187. package/src/service/model_storage_serve_joins.spec.ts +0 -193
  188. package/src/service/package.spec.ts +0 -612
  189. package/src/service/package.ts +0 -1799
  190. package/src/service/package_manifest.spec.ts +0 -230
  191. package/src/service/package_manifest.ts +0 -241
  192. package/src/service/package_memory_governor.spec.ts +0 -173
  193. package/src/service/package_memory_governor.ts +0 -233
  194. package/src/service/package_quote_bound_tables.spec.ts +0 -171
  195. package/src/service/package_race.spec.ts +0 -208
  196. package/src/service/package_reload_safety.spec.ts +0 -193
  197. package/src/service/package_rollback.spec.ts +0 -190
  198. package/src/service/package_worker_path.spec.ts +0 -645
  199. package/src/service/path_injection.spec.ts +0 -39
  200. package/src/service/persist_annotation_validation.spec.ts +0 -89
  201. package/src/service/persist_annotation_validation.ts +0 -59
  202. package/src/service/persistence_policy.spec.ts +0 -374
  203. package/src/service/proxy.spec.ts +0 -414
  204. package/src/service/proxy.ts +0 -248
  205. package/src/service/query_boundary.spec.ts +0 -470
  206. package/src/service/query_metadata.spec.ts +0 -408
  207. package/src/service/query_metadata.ts +0 -492
  208. package/src/service/query_metadata_identity.spec.ts +0 -149
  209. package/src/service/query_text.spec.ts +0 -79
  210. package/src/service/query_text.ts +0 -43
  211. package/src/service/quoting.spec.ts +0 -135
  212. package/src/service/quoting.ts +0 -78
  213. package/src/service/resolve_environment.ts +0 -15
  214. package/src/service/restricted_mode.spec.ts +0 -299
  215. package/src/service/source_extraction.ts +0 -225
  216. package/src/service/theme_store.ts +0 -199
  217. package/src/storage/DatabaseInterface.ts +0 -198
  218. package/src/storage/StorageManager.ts +0 -113
  219. package/src/storage/duckdb/ConnectionRepository.ts +0 -143
  220. package/src/storage/duckdb/DuckDBConnection.ts +0 -123
  221. package/src/storage/duckdb/DuckDBRepository.ts +0 -208
  222. package/src/storage/duckdb/EnvironmentRepository.ts +0 -148
  223. package/src/storage/duckdb/MaterializationRepository.spec.ts +0 -191
  224. package/src/storage/duckdb/MaterializationRepository.ts +0 -336
  225. package/src/storage/duckdb/PackageRepository.ts +0 -135
  226. package/src/storage/duckdb/schema.ts +0 -229
  227. package/src/stream_helpers.spec.ts +0 -280
  228. package/src/stream_helpers.ts +0 -162
  229. package/src/telemetry.ts +0 -20
  230. package/src/test_helpers/metrics_harness.ts +0 -166
  231. package/src/theme_key_parity.spec.ts +0 -57
  232. package/src/utils.ts +0 -29
  233. package/tests/fixtures/authorize-compile/model.malloy +0 -9
  234. package/tests/fixtures/authorize-compile/publisher.json +0 -4
  235. package/tests/fixtures/html-pages-nopublic/model.malloy +0 -1
  236. package/tests/fixtures/html-pages-nopublic/publisher.json +0 -5
  237. package/tests/fixtures/html-pages-test/data.csv +0 -3
  238. package/tests/fixtures/html-pages-test/public/assets/app.css +0 -3
  239. package/tests/fixtures/html-pages-test/public/barehtml.html +0 -4
  240. package/tests/fixtures/html-pages-test/public/bodymeta.html +0 -8
  241. package/tests/fixtures/html-pages-test/public/data.json +0 -1
  242. package/tests/fixtures/html-pages-test/public/fitcomment.html +0 -11
  243. package/tests/fixtures/html-pages-test/public/index.html +0 -9
  244. package/tests/fixtures/html-pages-test/public/nohead.html +0 -8
  245. package/tests/fixtures/html-pages-test/public/notfit.html +0 -13
  246. package/tests/fixtures/html-pages-test/public/slides.html +0 -12
  247. package/tests/fixtures/html-pages-test/public/sub/page2.html +0 -9
  248. package/tests/fixtures/html-pages-test/public/unterminated.html +0 -10
  249. package/tests/fixtures/html-pages-test/publisher.json +0 -5
  250. package/tests/fixtures/html-pages-test/report.malloy +0 -1
  251. package/tests/fixtures/persist-multi-level/data/orders.csv +0 -5
  252. package/tests/fixtures/persist-multi-level/multi_level.malloy +0 -18
  253. package/tests/fixtures/persist-multi-level/publisher.json +0 -5
  254. package/tests/fixtures/persist-schedule-test/data/orders.csv +0 -5
  255. package/tests/fixtures/persist-schedule-test/persist_schedule_test.malloy +0 -11
  256. package/tests/fixtures/persist-schedule-test/publisher.json +0 -7
  257. package/tests/fixtures/persist-schedule-warn-test/data/orders.csv +0 -5
  258. package/tests/fixtures/persist-schedule-warn-test/persist_warn_test.malloy +0 -11
  259. package/tests/fixtures/persist-schedule-warn-test/publisher.json +0 -6
  260. package/tests/fixtures/persist-test/data/orders.csv +0 -5
  261. package/tests/fixtures/persist-test/persist_test.malloy +0 -11
  262. package/tests/fixtures/persist-test/publisher.json +0 -5
  263. package/tests/fixtures/publisher.config.json +0 -15
  264. package/tests/fixtures/query-givens/data/orders.csv +0 -7
  265. package/tests/fixtures/query-givens/model.malloy +0 -34
  266. package/tests/fixtures/query-givens/publisher.json +0 -5
  267. package/tests/fixtures/xlsx/database.xlsx +0 -0
  268. package/tests/harness/mcp_test_setup.ts +0 -332
  269. package/tests/harness/rest_e2e.ts +0 -68
  270. package/tests/integration/authorize/compile_authorize_http.integration.spec.ts +0 -92
  271. package/tests/integration/concurrent_package/concurrent_package.integration.spec.ts +0 -280
  272. package/tests/integration/duckdb_storage/duckdb_storage.integration.spec.ts +0 -138
  273. package/tests/integration/first_boot/readiness_line.integration.spec.ts +0 -177
  274. package/tests/integration/html_pages/html_pages.integration.spec.ts +0 -440
  275. package/tests/integration/legacy_routes/legacy_routes.integration.spec.ts +0 -259
  276. package/tests/integration/materialization/environment_list.integration.spec.ts +0 -133
  277. package/tests/integration/materialization/freshness_gate.integration.spec.ts +0 -292
  278. package/tests/integration/materialization/manifest_binding.integration.spec.ts +0 -430
  279. package/tests/integration/materialization/materialization_lifecycle.integration.spec.ts +0 -441
  280. package/tests/integration/materialization/orchestrated_rebind.integration.spec.ts +0 -150
  281. package/tests/integration/materialization/reference_manifest.integration.spec.ts +0 -251
  282. package/tests/integration/materialization/schedule_edit.integration.spec.ts +0 -126
  283. package/tests/integration/materialization/scheduler.integration.spec.ts +0 -200
  284. package/tests/integration/materialization/scheduler_recovery.integration.spec.ts +0 -172
  285. package/tests/integration/materialization/scheduler_transitions.integration.spec.ts +0 -256
  286. package/tests/integration/materialization/scheduler_wiring.integration.spec.ts +0 -143
  287. package/tests/integration/mcp/mcp_execute_query_tool.integration.spec.ts +0 -438
  288. package/tests/integration/mcp/mcp_get_context_semantic.integration.spec.ts +0 -235
  289. package/tests/integration/mcp/mcp_transport.integration.spec.ts +0 -98
  290. package/tests/integration/query_givens/query_givens.integration.spec.ts +0 -146
  291. package/tests/integration/query_givens/query_givens_authorize.integration.spec.ts +0 -121
  292. package/tests/integration/sdk_givens/sdk_givens.integration.spec.ts +0 -110
  293. package/tests/integration/watch-mode/watch_mode.integration.spec.ts +0 -421
  294. package/tests/unit/controller/theme.controller.spec.ts +0 -141
  295. package/tests/unit/duckdb/attached_databases.test.ts +0 -1243
  296. package/tests/unit/duckdb/duckdb_connection.test.ts +0 -181
  297. package/tests/unit/duckdb/legacy_schema_migration.test.ts +0 -197
  298. package/tests/unit/duckdb/repositories.test.ts +0 -208
  299. package/tests/unit/ducklake/ducklake.test.ts +0 -952
  300. package/tests/unit/service/theme_store.spec.ts +0 -139
  301. package/tsconfig.json +0 -32
@@ -1,438 +0,0 @@
1
- // @ts-expect-error Bun test types are not recognized by ESLint
2
- import { Client } from "@modelcontextprotocol/sdk/client/index.js";
3
- import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
4
- import type {
5
- Notification,
6
- Request,
7
- Result,
8
- } from "@modelcontextprotocol/sdk/types.js"; // Keep these base types
9
- import { ErrorCode } from "@modelcontextprotocol/sdk/types.js";
10
- import { afterAll, beforeAll, describe, expect, it } from "bun:test";
11
- import { URL } from "url";
12
- import { MCP_ERROR_MESSAGES } from "../../../src/mcp/mcp_constants"; // Keep for error message checks
13
-
14
- // --- Import E2E Test Setup ---
15
- import {
16
- cleanupE2ETestEnvironment,
17
- McpE2ETestEnvironment,
18
- setupE2ETestEnvironment,
19
- } from "../../harness/mcp_test_setup";
20
-
21
- // --- Test Suite ---
22
- describe.serial("MCP Tool Handlers (E2E Integration)", () => {
23
- let env: McpE2ETestEnvironment | null = null;
24
- let mcpClient: Client;
25
-
26
- const ENVIRONMENT_NAME = "examples";
27
- const PACKAGE_NAME = "storefront";
28
-
29
- beforeAll(async () => {
30
- // Setup the E2E environment (starts server, connects client)
31
- env = await setupE2ETestEnvironment();
32
- mcpClient = env.mcpClient; // Assign client from setup
33
- });
34
-
35
- afterAll(async () => {
36
- await cleanupE2ETestEnvironment(env);
37
- env = null;
38
- });
39
-
40
- describe("malloy_executeQuery Tool", () => {
41
- // Constants for test parameters
42
-
43
- it(
44
- "should execute a valid ad-hoc query successfully",
45
- async () => {
46
- if (!env) throw new Error("Test environment not initialized");
47
- const result = await mcpClient.callTool({
48
- name: "malloy_executeQuery",
49
- arguments: {
50
- environmentName: ENVIRONMENT_NAME,
51
- packageName: PACKAGE_NAME,
52
- modelPath: "storefront.malloy",
53
- query: "run: order_items->{ aggregate: c is count() }",
54
- },
55
- });
56
-
57
- expect(result).toBeDefined();
58
- expect(result.isError).not.toBe(true); // Should be success
59
- expect(result.content).toBeDefined();
60
-
61
- const content = result.content as Array<{
62
- type: string;
63
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
64
- [key: string]: any;
65
- }>;
66
- expect(Array.isArray(content)).toBe(true);
67
- // Expect 1 content block (result)
68
- expect(content.length).toBe(1);
69
-
70
- // Check structure of each block
71
- for (const block of content) {
72
- expect(block.type).toBe("resource");
73
- expect(block.resource).toBeDefined();
74
- expect(block.resource.mimeType).toBe("application/json");
75
- expect(block.resource.text).toBeDefined();
76
- expect(typeof block.resource.text).toBe("string");
77
- }
78
-
79
- // Basic check on the first block (result)
80
-
81
- const queryResultBlock = content[0].resource;
82
- expect(queryResultBlock.uri).toContain("#result");
83
- const envelope = JSON.parse(queryResultBlock.text);
84
-
85
- // Flat rows keyed by column name: the same shape an in-package data
86
- // app receives, not the type-tagged Malloy cell envelope.
87
- expect(Array.isArray(envelope.rows)).toBe(true);
88
- expect(envelope.rows.length).toBeGreaterThan(0);
89
- expect(typeof envelope.rows[0]).toBe("object");
90
- expect(envelope.rows[0].data).toBeUndefined();
91
-
92
- // Credible's field names, so an agent sees one shape whether the
93
- // app is authored locally against Publisher or served in production.
94
- expect(typeof envelope._query_row_limit).toBe("number");
95
- expect(typeof envelope._limit_hit).toBe("boolean");
96
- // Absent rather than false when nothing was dropped.
97
- expect("_rows_truncated" in envelope).toBe(false);
98
- // The metadata flat rows drop.
99
- expect(envelope._meta.schema).toBeDefined();
100
- expect(typeof envelope._meta.connection_name).toBe("string");
101
- },
102
- { timeout: 30000 },
103
- );
104
-
105
- it(
106
- "should successfully execute a nested view using sourceName and queryName",
107
- async () => {
108
- if (!env) throw new Error("Test environment not initialized");
109
- const params = {
110
- environmentName: ENVIRONMENT_NAME,
111
- packageName: PACKAGE_NAME,
112
- modelPath: "storefront.malloy",
113
- sourceName: "order_items", // Added sourceName
114
- queryName: "top_products",
115
- };
116
-
117
- // Expect RESOLUTION with success
118
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
119
- const result: any = await mcpClient.callTool({
120
- name: "malloy_executeQuery",
121
- arguments: params,
122
- });
123
-
124
- expect(result).toBeDefined();
125
- expect(result.isError).toBe(false); // Expecting success
126
- expect(result.content).toBeDefined();
127
- expect(Array.isArray(result.content)).toBe(true);
128
- // Expect 1 content block (result)
129
- expect(result.content.length).toBeGreaterThan(0);
130
-
131
- // Check the structure of the first content block (result)
132
- const queryResultBlock = result.content![0];
133
- expect(queryResultBlock.type).toBe("resource");
134
- expect(queryResultBlock.resource).toBeDefined();
135
- expect(queryResultBlock.resource.mimeType).toBe("application/json");
136
- expect(queryResultBlock.resource.uri).toMatch(/result/); // Check URI contains queryResult
137
- expect(queryResultBlock.resource.text).toBeDefined();
138
-
139
- // Optionally, parse and check the actual data
140
- const queryResultPayload = JSON.parse(
141
- queryResultBlock.resource.text,
142
- );
143
- expect(queryResultPayload).toBeDefined();
144
- // Add more specific data checks if needed, e.g., check for specific columns or row count > 0
145
- // Example: expect(queryResultPayload._queryResult.data.rows.length).toBeGreaterThan(0);
146
- },
147
- { timeout: 30000 },
148
- );
149
-
150
- it(
151
- "should return application error for invalid Malloy query syntax",
152
- async () => {
153
- if (!env) throw new Error("Test environment not initialized");
154
- const params = {
155
- environmentName: ENVIRONMENT_NAME,
156
- packageName: PACKAGE_NAME,
157
- modelPath: "storefront.malloy",
158
- query: "run: order_items->{BAD SYNTAX aggregate: order_count is count()}",
159
- };
160
-
161
- // Application Error (Malloy Compilation): Expect RESOLUTION with isError: true
162
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
163
- const result: any = await mcpClient.callTool({
164
- name: "malloy_executeQuery",
165
- arguments: params,
166
- });
167
-
168
- expect(result.isError).toBe(true);
169
- expect(result.content).toBeDefined();
170
- // Check the new structure: resource -> application/json
171
- const errorBlockSyntax = result.content![0];
172
- expect(errorBlockSyntax.type).toBe("resource");
173
- expect(errorBlockSyntax.resource).toBeDefined();
174
- expect(errorBlockSyntax.resource.mimeType).toBe("application/json");
175
-
176
- // Check for Malloy compilation error message from getMalloyErrorDetails
177
- const errorJsonTextSyntax = errorBlockSyntax.resource
178
- .text as string;
179
- const errorPayloadSyntax = JSON.parse(errorJsonTextSyntax);
180
- expect(errorPayloadSyntax.error).toMatch(
181
- /syntax error|no viable alternative/i,
182
- );
183
- expect(Array.isArray(errorPayloadSyntax.suggestions)).toBe(true);
184
-
185
- // The resource block is invisible to a client that renders only
186
- // text on an isError result, which is how a real diagnostic gets
187
- // reported as a bare "Unknown error". Pinned here, over the real
188
- // HTTP transport, because the unit spec calls the handler directly
189
- // and so cannot catch the block being dropped in serialization.
190
- const textBlockSyntax = result.content!.find(
191
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
192
- (b: any) => b.type === "text",
193
- );
194
- expect(textBlockSyntax?.text).toContain(errorPayloadSyntax.error);
195
- },
196
- { timeout: 30000 },
197
- );
198
-
199
- // --- Parameter Validation Error Tests ---
200
- // These should RESOLVE with isError: true because the error is thrown
201
- // inside the handler and caught by the transport bridge, which returns 200 OK + error payload.
202
- it("should RESOLVE with InvalidParams for conflicting parameters (query and queryName)", async () => {
203
- if (!env) throw new Error("Test environment not initialized");
204
- const params = {
205
- environmentName: ENVIRONMENT_NAME,
206
- packageName: PACKAGE_NAME,
207
- modelPath: "storefront.malloy",
208
- query: "run: order_items->{aggregate: c is count()}",
209
- queryName: "top_products",
210
- };
211
-
212
- // Expect RESOLUTION because the error is thrown *inside* the handler
213
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
214
- const result: any = await mcpClient.callTool({
215
- name: "malloy_executeQuery",
216
- arguments: params,
217
- });
218
-
219
- expect(result.isError).toBe(true);
220
- expect(result.content).toBeDefined();
221
- // Revert to expecting type: "text" for McpError caught by SDK
222
- expect(result.content?.[0]?.type).toBe("text");
223
- // Check the error message in the content
224
- expect(result.content?.[0]?.text).toBe(
225
- // Match the message including the prefix added by the client/framework
226
- `MCP error ${ErrorCode.InvalidParams}: ${MCP_ERROR_MESSAGES.MUTUALLY_EXCLUSIVE_PARAMS}`,
227
- );
228
- });
229
-
230
- it("should RESOLVE with InvalidParams if required params are missing (e.g., query or queryName)", async () => {
231
- if (!env) throw new Error("Test environment not initialized");
232
- const params = {
233
- environmentName: ENVIRONMENT_NAME,
234
- packageName: PACKAGE_NAME,
235
- modelPath: "storefront.malloy",
236
- // Missing query AND queryName
237
- };
238
-
239
- // Expect RESOLUTION because the error is thrown *inside* the handler
240
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
241
- const result: any = await mcpClient.callTool({
242
- name: "malloy_executeQuery",
243
- arguments: params,
244
- });
245
-
246
- expect(result.isError).toBe(true);
247
- expect(result.content).toBeDefined();
248
- // Revert to expecting type: "text" for McpError caught by SDK
249
- expect(result.content?.[0]?.type).toBe("text");
250
- // Check the error message in the content
251
- expect(result.content?.[0]?.text).toBe(
252
- // Match the message including the prefix added by the client/framework
253
- `MCP error ${ErrorCode.InvalidParams}: ${MCP_ERROR_MESSAGES.MISSING_REQUIRED_PARAMS}`,
254
- );
255
- });
256
-
257
- it("should reject with InvalidParams if required top-level params are missing (e.g., modelPath)", async () => {
258
- if (!env) throw new Error("Test environment not initialized");
259
- const params = {
260
- // Missing modelPath
261
- environmentName: ENVIRONMENT_NAME,
262
- packageName: PACKAGE_NAME,
263
- query: "run: order_items->{aggregate: c is count()}",
264
- };
265
-
266
- // Protocol Error (Caught by Zod/MCP): Expect REJECTION
267
- await expect(
268
- mcpClient.callTool({
269
- name: "malloy_executeQuery",
270
- arguments: params,
271
- }),
272
- ).rejects.toMatchObject({
273
- code: ErrorCode.InvalidParams,
274
- // Zod error message will likely mention the missing field 'modelPath'
275
- message: expect.stringContaining("modelPath"),
276
- });
277
- });
278
- // --- End Parameter Validation Error Tests ---
279
-
280
- it("should return application error if package not found", async () => {
281
- if (!env) throw new Error("Test environment not initialized");
282
- const params = {
283
- environmentName: ENVIRONMENT_NAME,
284
- packageName: "nonexistent_package", // Use a package that doesn't exist
285
- modelPath: "storefront.malloy",
286
- query: "run: order_items->{aggregate: c is count()}",
287
- };
288
-
289
- // Application Error (Service Layer): Expect RESOLUTION with isError: true
290
- // Cast to any
291
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
292
- const result: any = await mcpClient.callTool({
293
- name: "malloy_executeQuery",
294
- arguments: params,
295
- });
296
-
297
- expect(result.isError).toBe(true);
298
- expect(result.content).toBeDefined();
299
- // Check the new structure: resource -> application/json
300
- const errorBlockPkgNotFound = result.content![0];
301
- expect(errorBlockPkgNotFound.type).toBe("resource");
302
- expect(errorBlockPkgNotFound.resource).toBeDefined();
303
- expect(errorBlockPkgNotFound.resource.mimeType).toBe(
304
- "application/json",
305
- );
306
-
307
- // Parse the JSON string from the resource text content
308
- const errorJsonTextPkgNotFound = errorBlockPkgNotFound.resource
309
- .text as string;
310
- const errorPayloadPkgNotFound = JSON.parse(errorJsonTextPkgNotFound);
311
-
312
- // Check the parsed error object
313
- expect(errorPayloadPkgNotFound).toBeDefined();
314
- expect(errorPayloadPkgNotFound.error).toBeDefined();
315
- expect(errorPayloadPkgNotFound.suggestions).toBeDefined();
316
- expect(Array.isArray(errorPayloadPkgNotFound.suggestions)).toBe(true);
317
- expect(errorPayloadPkgNotFound.suggestions.length).toBeGreaterThan(0);
318
-
319
- // Check the specific error message within the parsed object
320
- const expectedErrorMessageNotFound = `Resource not found: package '${params.packageName}' in environment '${params.environmentName}'`;
321
- expect(errorPayloadPkgNotFound.error).toEqual(
322
- expectedErrorMessageNotFound,
323
- );
324
- });
325
-
326
- it("should return application error if model not found within package", async () => {
327
- if (!env) throw new Error("Test environment not initialized");
328
- const params = {
329
- environmentName: ENVIRONMENT_NAME,
330
- packageName: PACKAGE_NAME,
331
- modelPath: "nonexistent_model.malloy", // Use a model that doesn't exist
332
- query: "run: order_items->{aggregate: c is count()}",
333
- };
334
-
335
- // Application Error (Service Layer): Expect RESOLUTION with isError: true
336
- // Cast to any
337
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
338
- const result: any = await mcpClient.callTool({
339
- name: "malloy_executeQuery",
340
- arguments: params,
341
- });
342
-
343
- expect(result.isError).toBe(true);
344
- expect(result.content).toBeDefined();
345
- // Check the new structure: resource -> application/json
346
- const errorBlockModel = result.content![0];
347
- expect(errorBlockModel.type).toBe("resource");
348
- expect(errorBlockModel.resource).toBeDefined();
349
- expect(errorBlockModel.resource.mimeType).toBe("application/json");
350
-
351
- // Parse the JSON string from the resource text content
352
- const errorJsonTextModel = errorBlockModel.resource.text as string;
353
- const errorPayloadModel = JSON.parse(errorJsonTextModel);
354
-
355
- // Check the parsed error object
356
- expect(errorPayloadModel).toBeDefined();
357
- expect(errorPayloadModel.error).toBeDefined();
358
- expect(errorPayloadModel.suggestions).toBeDefined();
359
- expect(Array.isArray(errorPayloadModel.suggestions)).toBe(true);
360
- expect(errorPayloadModel.suggestions.length).toBeGreaterThan(0);
361
-
362
- // Check the specific error message within the parsed object
363
- const expectedErrorMessageModel = `Resource not found: model '${params.modelPath}' in package '${params.packageName}' for environment '${params.environmentName}'`;
364
- expect(errorPayloadModel.error).toEqual(expectedErrorMessageModel);
365
-
366
- // Check for the specific model name and context in the message
367
- expect(errorPayloadModel.error).toMatch(/Resource not found/i);
368
- });
369
-
370
- // Stateless HTTP + fast queries make true in-flight cancellation flaky
371
- // (the response often completes before close wins the race). Assert the
372
- // transport contract instead: a closed client cannot issue further tools.
373
- it("should reject malloy_executeQuery after the MCP client is closed", async () => {
374
- if (!env) throw new Error("Test environment not initialized");
375
-
376
- const closedClient = new Client<Request, Notification, Result>({
377
- name: "closed-client-test",
378
- version: "1.0",
379
- });
380
- const transport = new StreamableHTTPClientTransport(
381
- new URL(env.serverUrl + "/mcp"),
382
- );
383
- await closedClient.connect(transport);
384
- await closedClient.close();
385
-
386
- await expect(
387
- closedClient.callTool({
388
- name: "malloy_executeQuery",
389
- arguments: {
390
- environmentName: ENVIRONMENT_NAME,
391
- packageName: PACKAGE_NAME,
392
- modelPath: "storefront.malloy",
393
- query: "run: order_items->{aggregate: c is count()}",
394
- },
395
- }),
396
- ).rejects.toThrow();
397
- });
398
-
399
- // Test invalid usage - nested view called without sourceName
400
- it("should return application error for nested view without sourceName", async () => {
401
- if (!env) throw new Error("Test environment not initialized");
402
- const params = {
403
- environmentName: ENVIRONMENT_NAME,
404
- packageName: PACKAGE_NAME,
405
- modelPath: "storefront.malloy",
406
- queryName: "top_products", // Nested view, but sourceName is missing
407
- };
408
-
409
- // Expect RESOLUTION with error because it's invalid usage processed by the handler
410
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
411
- const result: any = await mcpClient.callTool({
412
- name: "malloy_executeQuery",
413
- arguments: params,
414
- });
415
-
416
- expect(result).toBeDefined();
417
- expect(result.isError).toBe(true); // Expecting error
418
- expect(result.content).toBeDefined();
419
- expect(Array.isArray(result.content)).toBe(true);
420
- expect(result.content.length).toBeGreaterThan(0);
421
-
422
- // Check the error structure: resource -> application/json
423
- const errorBlock = result.content![0];
424
- expect(errorBlock.type).toBe("resource");
425
- expect(errorBlock.resource).toBeDefined();
426
- expect(errorBlock.resource.mimeType).toBe("application/json");
427
-
428
- // Check for Malloy error indicating the query/view wasn't found at the top level
429
- const errorJsonText = errorBlock.resource.text as string;
430
- const errorPayload = JSON.parse(errorJsonText);
431
- // Expect error about the query/view itself not found
432
- expect(errorPayload.error).toMatch(
433
- /Query 'top_products' not found|Reference to undefined object 'top_products'/i,
434
- );
435
- expect(Array.isArray(errorPayload.suggestions)).toBe(true);
436
- });
437
- });
438
- });
@@ -1,235 +0,0 @@
1
- import { afterAll, beforeAll, describe, expect, it } from "bun:test";
2
- import { Client } from "@modelcontextprotocol/sdk/client/index.js";
3
- import {
4
- Notification,
5
- Request,
6
- Result,
7
- } from "@modelcontextprotocol/sdk/types.js";
8
- import http from "http";
9
- import { AddressInfo } from "net";
10
- import {
11
- McpE2ETestEnvironment,
12
- cleanupE2ETestEnvironment,
13
- setupE2ETestEnvironment,
14
- } from "../../harness/mcp_test_setup";
15
-
16
- /**
17
- * End-to-end coverage of semantic malloy_getContext retrieval: the real
18
- * server, the real DuckDB vector cache, and a deterministic in-test
19
- * embedding endpoint (letter-bigram bag-of-words vectors, so related
20
- * phrases genuinely land near each other, no network, no key).
21
- */
22
-
23
- const ENVIRONMENT_NAME = "examples";
24
- const PACKAGE_NAME = "storefront";
25
- const DIMS = 64;
26
-
27
- /** Deterministic unit vector from letter bigrams. */
28
- function bigramVector(text: string): number[] {
29
- const v = new Array<number>(DIMS).fill(0);
30
- const s = ` ${text.toLowerCase().replace(/[^a-z0-9]+/g, " ")} `;
31
- for (let i = 0; i < s.length - 1; i++) {
32
- v[(s.charCodeAt(i) * 31 + s.charCodeAt(i + 1)) % DIMS] += 1;
33
- }
34
- const norm = Math.sqrt(v.reduce((acc, x) => acc + x * x, 0)) || 1;
35
- return v.map((x) => x / norm);
36
- }
37
-
38
- let env: McpE2ETestEnvironment | null = null;
39
- let mcpClient: Client<Request, Notification, Result>;
40
- let embeddingStub: http.Server;
41
- let stubFailing = false;
42
- let stubRequests = 0;
43
-
44
- const savedEnv: Record<string, string | undefined> = {};
45
- const ENV_KEYS = [
46
- "EMBEDDING_API_KEY",
47
- "EMBEDDING_API_BASE",
48
- "EMBEDDING_MODEL",
49
- "EMBEDDING_DIMENSIONS",
50
- ];
51
-
52
- interface GetContextPayload {
53
- retrieval?: string;
54
- results?: Array<{
55
- kind: string;
56
- name: string;
57
- source?: string;
58
- score?: number;
59
- }>;
60
- error?: string;
61
- }
62
-
63
- async function callGetContext(
64
- args: Record<string, unknown>,
65
- ): Promise<GetContextPayload> {
66
- const result = (await mcpClient.callTool({
67
- name: "malloy_getContext",
68
- arguments: args,
69
- })) as {
70
- content: Array<{ type: string; resource?: { text?: string } }>;
71
- };
72
- const text = result.content?.[0]?.resource?.text;
73
- if (!text) throw new Error("malloy_getContext returned no resource text");
74
- return JSON.parse(text) as GetContextPayload;
75
- }
76
-
77
- describe.serial("MCP getContext semantic retrieval (E2E Integration)", () => {
78
- beforeAll(async () => {
79
- // A local OpenAI-compatible /embeddings endpoint with deterministic
80
- // vectors. Bound to 127.0.0.1:0; the real port comes from the OS.
81
- embeddingStub = http.createServer((req, res) => {
82
- let body = "";
83
- req.on("data", (chunk) => (body += chunk));
84
- req.on("end", () => {
85
- stubRequests++;
86
- if (stubFailing) {
87
- res.writeHead(500).end("stub down");
88
- return;
89
- }
90
- const { input } = JSON.parse(body) as { input: string[] };
91
- res.writeHead(200, { "Content-Type": "application/json" }).end(
92
- JSON.stringify({
93
- data: input.map((text, index) => ({
94
- index,
95
- embedding: bigramVector(text),
96
- })),
97
- }),
98
- );
99
- });
100
- });
101
- await new Promise<void>((resolve) =>
102
- embeddingStub.listen(0, "127.0.0.1", resolve),
103
- );
104
- const port = (embeddingStub.address() as AddressInfo).port;
105
-
106
- // Set the embedding env vars BEFORE the server harness dynamically
107
- // imports src/server; config is read per call, but this keeps the
108
- // whole server lifetime consistently configured.
109
- for (const key of ENV_KEYS) {
110
- savedEnv[key] = process.env[key];
111
- }
112
- process.env.EMBEDDING_API_KEY = "integration-test-key";
113
- process.env.EMBEDDING_API_BASE = `http://127.0.0.1:${port}/v1`;
114
- // A stub-distinct model name: the suite shares publisher.db with
115
- // local manual runs, and rows cached under the real default model
116
- // name would poison a later real-provider run (the stub's bigram
117
- // vectors are not text-embedding-3-small's). Under this name the
118
- // leftovers are inert; a real run's model diff replaces them.
119
- process.env.EMBEDDING_MODEL = "integration-test-bigram-stub";
120
- delete process.env.EMBEDDING_DIMENSIONS;
121
-
122
- env = await setupE2ETestEnvironment();
123
- mcpClient = env.mcpClient;
124
- }, 200000);
125
-
126
- afterAll(async () => {
127
- await cleanupE2ETestEnvironment(env);
128
- env = null;
129
- // Restore the embedding env so later suites in this process run
130
- // unconfigured (the provider getter re-reads env per call).
131
- for (const key of ENV_KEYS) {
132
- if (savedEnv[key] === undefined) delete process.env[key];
133
- else process.env[key] = savedEnv[key];
134
- }
135
- await new Promise<void>((resolve, reject) =>
136
- embeddingStub.close((err) => (err ? reject(err) : resolve())),
137
- );
138
- });
139
-
140
- it(
141
- "answers lexically while indexing, then flips to semantic with scores",
142
- async () => {
143
- const first = await callGetContext({
144
- environmentName: ENVIRONMENT_NAME,
145
- packageName: PACKAGE_NAME,
146
- query: "total sales revenue",
147
- });
148
- // Configured server: the marker is always present on tier 4.
149
- expect(["lexical", "semantic"]).toContain(first.retrieval);
150
-
151
- let payload = first;
152
- for (let i = 0; i < 60 && payload.retrieval !== "semantic"; i++) {
153
- await new Promise((resolve) => setTimeout(resolve, 500));
154
- payload = await callGetContext({
155
- environmentName: ENVIRONMENT_NAME,
156
- packageName: PACKAGE_NAME,
157
- query: "total sales revenue",
158
- });
159
- }
160
- expect(payload.retrieval).toBe("semantic");
161
- expect(stubRequests).toBeGreaterThan(0);
162
-
163
- const results = payload.results ?? [];
164
- expect(results.length).toBeGreaterThan(0);
165
- for (const r of results) {
166
- expect(typeof r.score).toBe("number");
167
- }
168
- // The bigram embedding puts "total sales revenue" on top of the
169
- // total_sales measure ("total sales" once humanized).
170
- expect(results.some((r) => r.name === "total_sales")).toBe(true);
171
- },
172
- { timeout: 60000 },
173
- );
174
-
175
- it(
176
- "keeps the semantic index warm across calls (no re-embed per call)",
177
- async () => {
178
- const before = stubRequests;
179
- const payload = await callGetContext({
180
- environmentName: ENVIRONMENT_NAME,
181
- packageName: PACKAGE_NAME,
182
- query: "orders by month",
183
- });
184
- expect(payload.retrieval).toBe("semantic");
185
- // Exactly one stub call: the query embedding. No bulk re-sync.
186
- expect(stubRequests).toBe(before + 1);
187
- },
188
- { timeout: 30000 },
189
- );
190
-
191
- it(
192
- "narrows semantic retrieval with sourceName",
193
- async () => {
194
- const payload = await callGetContext({
195
- environmentName: ENVIRONMENT_NAME,
196
- packageName: PACKAGE_NAME,
197
- query: "total sales revenue",
198
- sourceName: "order_items",
199
- });
200
- expect(payload.retrieval).toBe("semantic");
201
- const results = payload.results ?? [];
202
- // Non-empty, or the per-result loop below pins nothing.
203
- expect(results.length).toBeGreaterThan(0);
204
- for (const r of results) {
205
- expect(r.source).toBe("order_items");
206
- }
207
- },
208
- { timeout: 30000 },
209
- );
210
-
211
- // Keep this test LAST: the induced failure starts the provider
212
- // cool-down, which short-circuits the semantic path for its window.
213
- it(
214
- "falls back to lexical, marked, when the embedding endpoint fails",
215
- async () => {
216
- stubFailing = true;
217
- try {
218
- const payload = await callGetContext({
219
- environmentName: ENVIRONMENT_NAME,
220
- packageName: PACKAGE_NAME,
221
- query: "top selling products",
222
- });
223
- expect(payload.retrieval).toBe("lexical");
224
- const results = payload.results ?? [];
225
- expect(results.length).toBeGreaterThan(0);
226
- for (const r of results) {
227
- expect(r.score).toBeUndefined();
228
- }
229
- } finally {
230
- stubFailing = false;
231
- }
232
- },
233
- { timeout: 30000 },
234
- );
235
- });