From 19f689797bb60b6bed61181142b9045154c76e4e Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 11:31:37 +0300
Subject: [PATCH 01/27] feat: add RuntimeClient, RuntimeProvider, and
 ConnectRPC proto gen (Phase 1)

Introduce the foundation for replacing the global mutable `runtime`
store with scoped Svelte context.

- Generate ConnectRPC TypeScript service descriptors for RuntimeService,
  QueryService, and ConnectorService via buf (new buf.gen.runtime.yaml)
- Add RuntimeClient class that encapsulates transport, JWT lifecycle,
  and lazy service client creation
- Add RuntimeProvider component that creates a RuntimeClient, sets it in
  Svelte context, and bridges to the global store for unmigrated consumers
- Add useRuntimeClient() context helper
- Wire RuntimeProvider into web-admin project layout with {#key} on
  host::instanceId for correct re-mounting on project navigation
- Wire RuntimeProvider into web-local root layout
- Extract JWT expiry constants to shared constants.ts
---
 Makefile                                      |   1 +
 proto/buf.gen.runtime.yaml                    |  16 +
 .../[organization]/[project]/+layout.svelte   |  42 +-
 .../proto/gen/rill/runtime/v1/api_connect.ts  | 610 ++++++++++++++++++
 .../gen/rill/runtime/v1/connectors_connect.ts |  94 +++
 .../gen/rill/runtime/v1/queries_connect.ts    | 405 ++++++++++++
 web-common/src/runtime-client/constants.ts    |   6 +
 web-common/src/runtime-client/http-client.ts  |   9 +-
 .../runtime-client/v2/RuntimeProvider.svelte  |  37 ++
 web-common/src/runtime-client/v2/context.ts   |  19 +
 web-common/src/runtime-client/v2/index.ts     |   2 +
 .../src/runtime-client/v2/runtime-client.ts   | 115 ++++
 web-local/src/routes/+layout.svelte           |  29 +-
 13 files changed, 1353 insertions(+), 32 deletions(-)
 create mode 100644 proto/buf.gen.runtime.yaml
 create mode 100644 web-common/src/proto/gen/rill/runtime/v1/api_connect.ts
 create mode 100644 web-common/src/proto/gen/rill/runtime/v1/connectors_connect.ts
 create mode 100644 web-common/src/proto/gen/rill/runtime/v1/queries_connect.ts
 create mode 100644 web-common/src/runtime-client/v2/RuntimeProvider.svelte
 create mode 100644 web-common/src/runtime-client/v2/context.ts
 create mode 100644 web-common/src/runtime-client/v2/index.ts
 create mode 100644 web-common/src/runtime-client/v2/runtime-client.ts

diff --git a/Makefile b/Makefile
index d268f0d5e34..0e046eba401 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,7 @@ proto.generate:
 	cd proto && buf generate --exclude-path rill/ui
 	cd proto && buf generate --template buf.gen.openapi-admin.yaml --path rill/admin
 	cd proto && buf generate --template buf.gen.openapi-runtime.yaml --path rill/runtime
+	cd proto && buf generate --template buf.gen.runtime.yaml --path rill/runtime
 	cd proto && buf generate --template buf.gen.local.yaml --path rill/local
 	cd proto && buf generate --template buf.gen.ui.yaml
 	go run -ldflags="-X main.Version=$(shell git describe --tags $(shell git rev-list --tags --max-count=1))" \
diff --git a/proto/buf.gen.runtime.yaml b/proto/buf.gen.runtime.yaml
new file mode 100644
index 00000000000..fe6bc5ba89b
--- /dev/null
+++ b/proto/buf.gen.runtime.yaml
@@ -0,0 +1,16 @@
+version: v2
+managed:
+  enabled: true
+  override:
+    - file_option: go_package_prefix
+      value: github.com/rilldata/rill/proto/gen
+  disable:
+    - module: buf.build/googleapis/googleapis
+      file_option: go_package_prefix
+    - module: buf.build/envoyproxy/protoc-gen-validate
+      file_option: go_package_prefix
+plugins:
+  - remote: buf.build/connectrpc/es:v1.4.0
+    out: ../web-common/src/proto/gen
+    opt:
+      - target=ts
diff --git a/web-admin/src/routes/[organization]/[project]/+layout.svelte b/web-admin/src/routes/[organization]/[project]/+layout.svelte
index c983cb6b533..46f07e16c6e 100644
--- a/web-admin/src/routes/[organization]/[project]/+layout.svelte
+++ b/web-admin/src/routes/[organization]/[project]/+layout.svelte
@@ -51,10 +51,10 @@
   import { viewAsUserStore } from "@rilldata/web-admin/features/view-as-user/viewAsUserStore";
   import ErrorPage from "@rilldata/web-common/components/ErrorPage.svelte";
   import { metricsService } from "@rilldata/web-common/metrics/initMetrics";
-  import RuntimeProvider from "@rilldata/web-common/runtime-client/RuntimeProvider.svelte";
+  import RuntimeProvider from "@rilldata/web-common/runtime-client/v2/RuntimeProvider.svelte";
   import { RUNTIME_ACCESS_TOKEN_DEFAULT_TTL } from "@rilldata/web-common/runtime-client/constants";
   import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
-  import type { AuthContext } from "@rilldata/web-common/runtime-client/runtime-store";
+  import type { AuthContext } from "@rilldata/web-common/runtime-client/v2/runtime-client";
   import type { CreateQueryOptions } from "@tanstack/svelte-query";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.ts";
   import { getRuntimeServiceListResourcesQueryKey } from "@rilldata/web-common/runtime-client";
@@ -205,6 +205,20 @@
         : "user"
   ) as AuthContext;
 
+  // Derive effective runtime connection props
+  $: effectiveHost =
+    mockedUserId && mockedUserDeploymentCredentials
+      ? mockedUserDeploymentCredentials.runtimeHost
+      : projectData?.deployment?.runtimeHost;
+  $: effectiveInstanceId =
+    mockedUserId && mockedUserDeploymentCredentials
+      ? mockedUserDeploymentCredentials.instanceId
+      : projectData?.deployment?.runtimeInstanceId;
+  $: effectiveJwt =
+    mockedUserId && mockedUserDeploymentCredentials
+      ? mockedUserDeploymentCredentials.accessToken
+      : projectData?.jwt;
+
   // Load telemetry client with relevant context
   $: if (project && $user.data?.user?.id) {
     metricsService?.loadCloudFields({
@@ -247,19 +261,15 @@
         : "There was an error deploying your project. Please contact support."}
     />
   {:else if isProjectAvailable}
-    <RuntimeProvider
-      instanceId={mockedUserId && mockedUserDeploymentCredentials
-        ? mockedUserDeploymentCredentials.instanceId
-        : projectData.deployment.runtimeInstanceId}
-      host={mockedUserId && mockedUserDeploymentCredentials
-        ? mockedUserDeploymentCredentials.runtimeHost
-        : projectData.deployment.runtimeHost}
-      jwt={mockedUserId && mockedUserDeploymentCredentials
-        ? mockedUserDeploymentCredentials.accessToken
-        : projectData.jwt}
-      {authContext}
-    >
-      <slot />
-    </RuntimeProvider>
+    {#key `${effectiveHost}::${effectiveInstanceId}`}
+      <RuntimeProvider
+        host={effectiveHost}
+        instanceId={effectiveInstanceId}
+        jwt={effectiveJwt}
+        {authContext}
+      >
+        <slot />
+      </RuntimeProvider>
+    {/key}
   {/if}
 {/if}
diff --git a/web-common/src/proto/gen/rill/runtime/v1/api_connect.ts b/web-common/src/proto/gen/rill/runtime/v1/api_connect.ts
new file mode 100644
index 00000000000..204bcbbd6f9
--- /dev/null
+++ b/web-common/src/proto/gen/rill/runtime/v1/api_connect.ts
@@ -0,0 +1,610 @@
+// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts"
+// @generated from file rill/runtime/v1/api.proto (package rill.runtime.v1, syntax proto3)
+/* eslint-disable */
+// @ts-nocheck
+
+import { AnalyzeConnectorsRequest, AnalyzeConnectorsResponse, AnalyzeVariablesRequest, AnalyzeVariablesResponse, CompleteRequest, CompleteResponse, CompleteStreamingRequest, CompleteStreamingResponse, CreateDirectoryRequest, CreateDirectoryResponse, CreateInstanceRequest, CreateInstanceResponse, CreateTriggerRequest, CreateTriggerResponse, DeleteFileRequest, DeleteFileResponse, DeleteInstanceRequest, DeleteInstanceResponse, EditInstanceRequest, EditInstanceResponse, ForkConversationRequest, ForkConversationResponse, GenerateCanvasFileRequest, GenerateCanvasFileResponse, GenerateMetricsViewFileRequest, GenerateMetricsViewFileResponse, GenerateRendererRequest, GenerateRendererResponse, GenerateResolverRequest, GenerateResolverResponse, GetConversationRequest, GetConversationResponse, GetExploreRequest, GetExploreResponse, GetFileRequest, GetFileResponse, GetInstanceRequest, GetInstanceResponse, GetLogsRequest, GetLogsResponse, GetModelPartitionsRequest, GetModelPartitionsResponse, GetResourceRequest, GetResourceResponse, GitCommitRequest, GitCommitResponse, GitMergeToBranchRequest, GitMergeToBranchResponse, GitPullRequest, GitPullResponse, GitPushRequest, GitPushResponse, GitStatusRequest, GitStatusResponse, GitSwitchBranchRequest, GitSwitchBranchResponse, HealthRequest, HealthResponse, InstanceHealthRequest, InstanceHealthResponse, IssueDevJWTRequest, IssueDevJWTResponse, ListConnectorDriversRequest, ListConnectorDriversResponse, ListConversationsRequest, ListConversationsResponse, ListExamplesRequest, ListExamplesResponse, ListFilesRequest, ListFilesResponse, ListGitBranchesRequest, ListGitBranchesResponse, ListGitCommitsRequest, ListGitCommitsResponse, ListInstancesRequest, ListInstancesResponse, ListNotifierConnectorsRequest, ListNotifierConnectorsResponse, ListResourcesRequest, ListResourcesResponse, ListToolsRequest, ListToolsResponse, PingRequest, PingResponse, PutFileRequest, PutFileResponse, QueryResolverRequest, QueryResolverResponse, ReloadConfigRequest, ReloadConfigResponse, RenameFileRequest, RenameFileResponse, RestoreGitCommitRequest, RestoreGitCommitResponse, ShareConversationRequest, ShareConversationResponse, UnpackEmptyRequest, UnpackEmptyResponse, UnpackExampleRequest, UnpackExampleResponse, WatchFilesRequest, WatchFilesResponse, WatchLogsRequest, WatchLogsResponse, WatchResourcesRequest, WatchResourcesResponse } from "./api_pb.js";
+import { MethodKind } from "@bufbuild/protobuf";
+
+/**
+ * RuntimeService is a data infrastructure proxy and orchestrator based on Rill SQL.
+ * It has a concept of instances, which are fully isolated data projects, enabling optional multi-tenancy.
+ *
+ * @generated from service rill.runtime.v1.RuntimeService
+ */
+export const RuntimeService = {
+  typeName: "rill.runtime.v1.RuntimeService",
+  methods: {
+    /**
+     * Ping returns information about the runtime
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.Ping
+     */
+    ping: {
+      name: "Ping",
+      I: PingRequest,
+      O: PingResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Health runs a health check on the runtime.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.Health
+     */
+    health: {
+      name: "Health",
+      I: HealthRequest,
+      O: HealthResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * InstanceHealth runs a health check on a specific instance.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.InstanceHealth
+     */
+    instanceHealth: {
+      name: "InstanceHealth",
+      I: InstanceHealthRequest,
+      O: InstanceHealthResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListInstances lists all the instances currently managed by the runtime
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListInstances
+     */
+    listInstances: {
+      name: "ListInstances",
+      I: ListInstancesRequest,
+      O: ListInstancesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GetInstance returns information about a specific instance
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GetInstance
+     */
+    getInstance: {
+      name: "GetInstance",
+      I: GetInstanceRequest,
+      O: GetInstanceResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * CreateInstance creates a new instance
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.CreateInstance
+     */
+    createInstance: {
+      name: "CreateInstance",
+      I: CreateInstanceRequest,
+      O: CreateInstanceResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * EditInstance edits an existing instance
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.EditInstance
+     */
+    editInstance: {
+      name: "EditInstance",
+      I: EditInstanceRequest,
+      O: EditInstanceResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * DeleteInstance deletes an instance
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.DeleteInstance
+     */
+    deleteInstance: {
+      name: "DeleteInstance",
+      I: DeleteInstanceRequest,
+      O: DeleteInstanceResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ReloadConfig pulls the latest configuration from the admin service and triggers a repo pull.
+     * If the instance doesn't have an admin connector, this RPC does nothing.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ReloadConfig
+     */
+    reloadConfig: {
+      name: "ReloadConfig",
+      I: ReloadConfigRequest,
+      O: ReloadConfigResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListFiles lists all the files matching a glob in a repo.
+     * The files are sorted by their full path.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListFiles
+     */
+    listFiles: {
+      name: "ListFiles",
+      I: ListFilesRequest,
+      O: ListFilesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * WatchFiles streams repo file update events. It is not supported on all backends.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.WatchFiles
+     */
+    watchFiles: {
+      name: "WatchFiles",
+      I: WatchFilesRequest,
+      O: WatchFilesResponse,
+      kind: MethodKind.ServerStreaming,
+    },
+    /**
+     * GetFile returns the contents of a specific file in a repo.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GetFile
+     */
+    getFile: {
+      name: "GetFile",
+      I: GetFileRequest,
+      O: GetFileResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * PutFile creates or updates a file in a repo
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.PutFile
+     */
+    putFile: {
+      name: "PutFile",
+      I: PutFileRequest,
+      O: PutFileResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * CreateDirectory create a directory for the given path
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.CreateDirectory
+     */
+    createDirectory: {
+      name: "CreateDirectory",
+      I: CreateDirectoryRequest,
+      O: CreateDirectoryResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * DeleteFile deletes a file from a repo
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.DeleteFile
+     */
+    deleteFile: {
+      name: "DeleteFile",
+      I: DeleteFileRequest,
+      O: DeleteFileResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * RenameFile renames a file in a repo
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.RenameFile
+     */
+    renameFile: {
+      name: "RenameFile",
+      I: RenameFileRequest,
+      O: RenameFileResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListExamples lists all the examples embedded into binary
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListExamples
+     */
+    listExamples: {
+      name: "ListExamples",
+      I: ListExamplesRequest,
+      O: ListExamplesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * UnpackExample unpacks an example project
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.UnpackExample
+     */
+    unpackExample: {
+      name: "UnpackExample",
+      I: UnpackExampleRequest,
+      O: UnpackExampleResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * UnpackEmpty unpacks an empty project
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.UnpackEmpty
+     */
+    unpackEmpty: {
+      name: "UnpackEmpty",
+      I: UnpackEmptyRequest,
+      O: UnpackEmptyResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GenerateMetricsViewFile generates a metrics view YAML file from a table in an OLAP database
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GenerateMetricsViewFile
+     */
+    generateMetricsViewFile: {
+      name: "GenerateMetricsViewFile",
+      I: GenerateMetricsViewFileRequest,
+      O: GenerateMetricsViewFileResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GenerateCanvasFile generates a canvas YAML file from a metrics view
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GenerateCanvasFile
+     */
+    generateCanvasFile: {
+      name: "GenerateCanvasFile",
+      I: GenerateCanvasFileRequest,
+      O: GenerateCanvasFileResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GenerateResolver generates resolver and resolver properties from a table or a metrics view
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GenerateResolver
+     */
+    generateResolver: {
+      name: "GenerateResolver",
+      I: GenerateResolverRequest,
+      O: GenerateResolverResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GenerateRenderer generates a component renderer and renderer properties from a resolver and resolver properties
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GenerateRenderer
+     */
+    generateRenderer: {
+      name: "GenerateRenderer",
+      I: GenerateRendererRequest,
+      O: GenerateRendererResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * QueryResolver queries a resolver with the given properties and arguments
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.QueryResolver
+     */
+    queryResolver: {
+      name: "QueryResolver",
+      I: QueryResolverRequest,
+      O: QueryResolverResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GetLogs returns recent logs from a controller
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GetLogs
+     */
+    getLogs: {
+      name: "GetLogs",
+      I: GetLogsRequest,
+      O: GetLogsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * WatchLogs streams new logs emitted from a controller
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.WatchLogs
+     */
+    watchLogs: {
+      name: "WatchLogs",
+      I: WatchLogsRequest,
+      O: WatchLogsResponse,
+      kind: MethodKind.ServerStreaming,
+    },
+    /**
+     * ListResources lists the resources stored in the catalog
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListResources
+     */
+    listResources: {
+      name: "ListResources",
+      I: ListResourcesRequest,
+      O: ListResourcesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * WatchResources streams updates to catalog resources (including creation and deletion events)
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.WatchResources
+     */
+    watchResources: {
+      name: "WatchResources",
+      I: WatchResourcesRequest,
+      O: WatchResourcesResponse,
+      kind: MethodKind.ServerStreaming,
+    },
+    /**
+     * GetResource looks up a specific catalog resource
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GetResource
+     */
+    getResource: {
+      name: "GetResource",
+      I: GetResourceRequest,
+      O: GetResourceResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GetExplore is a convenience RPC that combines looking up an Explore resource and its underlying MetricsView into one network call.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GetExplore
+     */
+    getExplore: {
+      name: "GetExplore",
+      I: GetExploreRequest,
+      O: GetExploreResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GetModelPartitions returns the partitions of a model
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GetModelPartitions
+     */
+    getModelPartitions: {
+      name: "GetModelPartitions",
+      I: GetModelPartitionsRequest,
+      O: GetModelPartitionsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * CreateTrigger submits a refresh trigger, which will asynchronously refresh the specified resources.
+     * Triggers are ephemeral resources that will be cleaned up by the controller.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.CreateTrigger
+     */
+    createTrigger: {
+      name: "CreateTrigger",
+      I: CreateTriggerRequest,
+      O: CreateTriggerResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListConnectorDrivers returns a description of all the connector drivers registed in the runtime,
+     * including their configuration specs and the capabilities they support.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListConnectorDrivers
+     */
+    listConnectorDrivers: {
+      name: "ListConnectorDrivers",
+      I: ListConnectorDriversRequest,
+      O: ListConnectorDriversResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * AnalyzeConnectors scans all the project files and returns information about all referenced connectors.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.AnalyzeConnectors
+     */
+    analyzeConnectors: {
+      name: "AnalyzeConnectors",
+      I: AnalyzeConnectorsRequest,
+      O: AnalyzeConnectorsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListNotifierConnectors returns the names of all configured connectors that can be used as notifiers.
+     * This API is much faster than AnalyzeConnectors and can be called without admin-level permissions.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListNotifierConnectors
+     */
+    listNotifierConnectors: {
+      name: "ListNotifierConnectors",
+      I: ListNotifierConnectorsRequest,
+      O: ListNotifierConnectorsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListConversations lists all AI chat conversations for an instance.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListConversations
+     */
+    listConversations: {
+      name: "ListConversations",
+      I: ListConversationsRequest,
+      O: ListConversationsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GetConversation returns a specific AI chat conversation.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GetConversation
+     */
+    getConversation: {
+      name: "GetConversation",
+      I: GetConversationRequest,
+      O: GetConversationResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ShareConversation enables sharing of the conversation by adding metadata.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ShareConversation
+     */
+    shareConversation: {
+      name: "ShareConversation",
+      I: ShareConversationRequest,
+      O: ShareConversationResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ForkConversation creates a new conversation by copying messages from an existing one.
+     * If its the owner then all messages will be copied, otherwise only messages up to the session.SharedUntilMessageID are copied.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ForkConversation
+     */
+    forkConversation: {
+      name: "ForkConversation",
+      I: ForkConversationRequest,
+      O: ForkConversationResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListTools lists metadata about all AI tools that calls to Complete(Streaming) may invoke.
+     * Note that it covers all registered tools, but the current user may not have access to all of them.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListTools
+     */
+    listTools: {
+      name: "ListTools",
+      I: ListToolsRequest,
+      O: ListToolsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Complete runs a language model completion (LLM chat) using the configured AI connector.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.Complete
+     */
+    complete: {
+      name: "Complete",
+      I: CompleteRequest,
+      O: CompleteResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * CompleteStreaming runs an AI-powered chat completion, optionally invoking agents or tool calls available in Rill.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.CompleteStreaming
+     */
+    completeStreaming: {
+      name: "CompleteStreaming",
+      I: CompleteStreamingRequest,
+      O: CompleteStreamingResponse,
+      kind: MethodKind.ServerStreaming,
+    },
+    /**
+     * IssueDevJWT issues a JWT for mimicking a user in local development.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.IssueDevJWT
+     */
+    issueDevJWT: {
+      name: "IssueDevJWT",
+      I: IssueDevJWTRequest,
+      O: IssueDevJWTResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * AnalyzeVariables scans `Source`, `Model` and `Connector` resources in the catalog for use of an environment variable
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.AnalyzeVariables
+     */
+    analyzeVariables: {
+      name: "AnalyzeVariables",
+      I: AnalyzeVariablesRequest,
+      O: AnalyzeVariablesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListGitCommits
+     */
+    listGitCommits: {
+      name: "ListGitCommits",
+      I: ListGitCommitsRequest,
+      O: ListGitCommitsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GitStatus returns the current status of the local git repo. This is equivalent to doing a `git fetch` followed by running `git status`.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GitStatus
+     */
+    gitStatus: {
+      name: "GitStatus",
+      I: GitStatusRequest,
+      O: GitStatusResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * @generated from rpc rill.runtime.v1.RuntimeService.ListGitBranches
+     */
+    listGitBranches: {
+      name: "ListGitBranches",
+      I: ListGitBranchesRequest,
+      O: ListGitBranchesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GitCommit commits the local changes to the git repo equivalent to `git commit -am <message>` command.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GitCommit
+     */
+    gitCommit: {
+      name: "GitCommit",
+      I: GitCommitRequest,
+      O: GitCommitResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * RestoreGitCommit creates a new commit that restores the state of the repo to the specified commit SHA.
+     * This effectively discards all the changes made after the specified commit.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.RestoreGitCommit
+     */
+    restoreGitCommit: {
+      name: "RestoreGitCommit",
+      I: RestoreGitCommitRequest,
+      O: RestoreGitCommitResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GitMergeToBranch merges current branch to the specified branch.
+     * Note: this is not the same as `git merge <branch>`, but rather `git checkout <branch>` followed by `git merge <current-branch>`.
+     * It restores back to the original branch after the merge.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GitMergeToBranch
+     */
+    gitMergeToBranch: {
+      name: "GitMergeToBranch",
+      I: GitMergeToBranchRequest,
+      O: GitMergeToBranchResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * @generated from rpc rill.runtime.v1.RuntimeService.GitSwitchBranch
+     */
+    gitSwitchBranch: {
+      name: "GitSwitchBranch",
+      I: GitSwitchBranchRequest,
+      O: GitSwitchBranchResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GitPull fetches the latest changes from the remote git repo equivalent to `git pull` command.
+     * If there are any merge conflicts the pull is aborted.
+     * Force can be set to true to force the pull and overwrite any local changes.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GitPull
+     */
+    gitPull: {
+      name: "GitPull",
+      I: GitPullRequest,
+      O: GitPullResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GitPush pushes the local changes to the remote git repo equivalent to `git push` command.
+     * It only pushes the changes to the existing remote repo.
+     *
+     * @generated from rpc rill.runtime.v1.RuntimeService.GitPush
+     */
+    gitPush: {
+      name: "GitPush",
+      I: GitPushRequest,
+      O: GitPushResponse,
+      kind: MethodKind.Unary,
+    },
+  }
+} as const;
+
diff --git a/web-common/src/proto/gen/rill/runtime/v1/connectors_connect.ts b/web-common/src/proto/gen/rill/runtime/v1/connectors_connect.ts
new file mode 100644
index 00000000000..ba9bcec6e68
--- /dev/null
+++ b/web-common/src/proto/gen/rill/runtime/v1/connectors_connect.ts
@@ -0,0 +1,94 @@
+// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts"
+// @generated from file rill/runtime/v1/connectors.proto (package rill.runtime.v1, syntax proto3)
+/* eslint-disable */
+// @ts-nocheck
+
+import { GetTableRequest, GetTableResponse, ListBucketsRequest, ListBucketsResponse, ListDatabaseSchemasRequest, ListDatabaseSchemasResponse, ListObjectsRequest, ListObjectsResponse, ListTablesRequest, ListTablesResponse, OLAPGetTableRequest, OLAPGetTableResponse, OLAPListTablesRequest, OLAPListTablesResponse } from "./connectors_pb.js";
+import { MethodKind } from "@bufbuild/protobuf";
+
+/**
+ * @generated from service rill.runtime.v1.ConnectorService
+ */
+export const ConnectorService = {
+  typeName: "rill.runtime.v1.ConnectorService",
+  methods: {
+    /**
+     * ListBuckets lists buckets accessible with the configured credentials.
+     *
+     * @generated from rpc rill.runtime.v1.ConnectorService.ListBuckets
+     */
+    listBuckets: {
+      name: "ListBuckets",
+      I: ListBucketsRequest,
+      O: ListBucketsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListObjects lists objects for the given bucket.
+     *
+     * @generated from rpc rill.runtime.v1.ConnectorService.ListObjects
+     */
+    listObjects: {
+      name: "ListObjects",
+      I: ListObjectsRequest,
+      O: ListObjectsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * OLAPListTables list all tables across all databases in an OLAP
+     *
+     * @generated from rpc rill.runtime.v1.ConnectorService.OLAPListTables
+     */
+    oLAPListTables: {
+      name: "OLAPListTables",
+      I: OLAPListTablesRequest,
+      O: OLAPListTablesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * OLAPGetTable returns metadata about a table or view in an OLAP
+     *
+     * @generated from rpc rill.runtime.v1.ConnectorService.OLAPGetTable
+     */
+    oLAPGetTable: {
+      name: "OLAPGetTable",
+      I: OLAPGetTableRequest,
+      O: OLAPGetTableResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListDatabaseSchemas list all schemas across databases 
+     *
+     * @generated from rpc rill.runtime.v1.ConnectorService.ListDatabaseSchemas
+     */
+    listDatabaseSchemas: {
+      name: "ListDatabaseSchemas",
+      I: ListDatabaseSchemasRequest,
+      O: ListDatabaseSchemasResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ListTables list all tables for database and database_schema provided
+     *
+     * @generated from rpc rill.runtime.v1.ConnectorService.ListTables
+     */
+    listTables: {
+      name: "ListTables",
+      I: ListTablesRequest,
+      O: ListTablesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * GetTable returns metadata about a table or view
+     *
+     * @generated from rpc rill.runtime.v1.ConnectorService.GetTable
+     */
+    getTable: {
+      name: "GetTable",
+      I: GetTableRequest,
+      O: GetTableResponse,
+      kind: MethodKind.Unary,
+    },
+  }
+} as const;
+
diff --git a/web-common/src/proto/gen/rill/runtime/v1/queries_connect.ts b/web-common/src/proto/gen/rill/runtime/v1/queries_connect.ts
new file mode 100644
index 00000000000..1c68c818d99
--- /dev/null
+++ b/web-common/src/proto/gen/rill/runtime/v1/queries_connect.ts
@@ -0,0 +1,405 @@
+// @generated by protoc-gen-connect-es v1.4.0 with parameter "target=ts"
+// @generated from file rill/runtime/v1/queries.proto (package rill.runtime.v1, syntax proto3)
+/* eslint-disable */
+// @ts-nocheck
+
+import { ColumnCardinalityRequest, ColumnCardinalityResponse, ColumnDescriptiveStatisticsRequest, ColumnDescriptiveStatisticsResponse, ColumnNullCountRequest, ColumnNullCountResponse, ColumnNumericHistogramRequest, ColumnNumericHistogramResponse, ColumnRollupIntervalRequest, ColumnRollupIntervalResponse, ColumnRugHistogramRequest, ColumnRugHistogramResponse, ColumnTimeGrainRequest, ColumnTimeGrainResponse, ColumnTimeRangeRequest, ColumnTimeRangeResponse, ColumnTimeSeriesRequest, ColumnTimeSeriesResponse, ColumnTopKRequest, ColumnTopKResponse, ConvertExpressionToMetricsSQLRequest, ConvertExpressionToMetricsSQLResponse, ExportReportRequest, ExportReportResponse, ExportRequest, ExportResponse, MetricsViewAggregationRequest, MetricsViewAggregationResponse, MetricsViewAnnotationsRequest, MetricsViewAnnotationsResponse, MetricsViewComparisonRequest, MetricsViewComparisonResponse, MetricsViewRowsRequest, MetricsViewRowsResponse, MetricsViewSchemaRequest, MetricsViewSchemaResponse, MetricsViewSearchRequest, MetricsViewSearchResponse, MetricsViewTimeRangeRequest, MetricsViewTimeRangeResponse, MetricsViewTimeRangesRequest, MetricsViewTimeRangesResponse, MetricsViewTimeSeriesRequest, MetricsViewTimeSeriesResponse, MetricsViewToplistRequest, MetricsViewToplistResponse, MetricsViewTotalsRequest, MetricsViewTotalsResponse, QueryBatchRequest, QueryBatchResponse, QueryRequest, QueryResponse, ResolveCanvasRequest, ResolveCanvasResponse, ResolveComponentRequest, ResolveComponentResponse, ResolveTemplatedStringRequest, ResolveTemplatedStringResponse, TableCardinalityRequest, TableCardinalityResponse, TableColumnsRequest, TableColumnsResponse, TableRowsRequest, TableRowsResponse } from "./queries_pb.js";
+import { MethodKind } from "@bufbuild/protobuf";
+
+/**
+ * @generated from service rill.runtime.v1.QueryService
+ */
+export const QueryService = {
+  typeName: "rill.runtime.v1.QueryService",
+  methods: {
+    /**
+     * Query runs a SQL query against the instance's OLAP datastore.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.Query
+     */
+    query: {
+      name: "Query",
+      I: QueryRequest,
+      O: QueryResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Batch request with different queries
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.QueryBatch
+     */
+    queryBatch: {
+      name: "QueryBatch",
+      I: QueryBatchRequest,
+      O: QueryBatchResponse,
+      kind: MethodKind.ServerStreaming,
+    },
+    /**
+     * Export builds a URL to download the results of a query as a file.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.Export
+     */
+    export: {
+      name: "Export",
+      I: ExportRequest,
+      O: ExportResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ExportReport builds a URL to download the results of a query as a file.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ExportReport
+     */
+    exportReport: {
+      name: "ExportReport",
+      I: ExportReportRequest,
+      O: ExportReportResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * MetricsViewAggregation is a generic API for running group-by/pivot queries against a metrics view.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewAggregation
+     */
+    metricsViewAggregation: {
+      name: "MetricsViewAggregation",
+      I: MetricsViewAggregationRequest,
+      O: MetricsViewAggregationResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     *
+     * Deprecated - use MetricsViewComparison instead.
+     * MetricsViewToplist returns the top dimension values of a metrics view sorted by one or more measures.
+     * It's a convenience API for querying a metrics view.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewToplist
+     */
+    metricsViewToplist: {
+      name: "MetricsViewToplist",
+      I: MetricsViewToplistRequest,
+      O: MetricsViewToplistResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     *
+     * MetricsViewComparison returns a toplist containing comparison data of another toplist (same dimension/measure but a different time range).
+     * Returns a toplist without comparison data if comparison time range is omitted.
+     *
+     * ie. comparsion toplist:
+     * | measure1_base | measure1_previous   | measure1__delta_abs | measure1__delta_rel | dimension |
+     * |---------------|---------------------|---------------------|--------------------|-----------|
+     * | 2             | 2                   | 0                   | 0                  | Safari    |
+     * | 1             | 0                   | 1                   | N/A                | Chrome    |
+     * | 0             | 4                   | -4                  | -1.0               | Firefox   |
+     *
+     * ie. toplist:
+     * | measure1 | measure2 | dimension |
+     * |----------|----------|-----------|
+     * | 2        | 45       | Safari    |
+     * | 1        | 350      | Chrome    |
+     * | 0        | 25       | Firefox   |
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewComparison
+     */
+    metricsViewComparison: {
+      name: "MetricsViewComparison",
+      I: MetricsViewComparisonRequest,
+      O: MetricsViewComparisonResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * MetricsViewTimeSeries returns time series for the measures in the metrics view.
+     * It's a convenience API for querying a metrics view.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewTimeSeries
+     */
+    metricsViewTimeSeries: {
+      name: "MetricsViewTimeSeries",
+      I: MetricsViewTimeSeriesRequest,
+      O: MetricsViewTimeSeriesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * MetricsViewTotals returns totals over a time period for the measures in a metrics view.
+     * It's a convenience API for querying a metrics view.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewTotals
+     */
+    metricsViewTotals: {
+      name: "MetricsViewTotals",
+      I: MetricsViewTotalsRequest,
+      O: MetricsViewTotalsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     *
+     * MetricsViewRows returns the underlying model rows matching a metrics view time range and filter(s).
+     *
+     * ie. without granularity
+     * | column1 | column2 | dimension |
+     * |---------|---------|-----------|
+     * | 2       | 2       | Safari    |
+     * | 1       | 0       | Chrome    |
+     * | 0       | 4       | Firefox   |
+     *
+     * ie. with granularity
+     * | timestamp__day0      | column1 | column2 | dimension |
+     * |----------------------|---------|---------|-----------|
+     * | 2022-01-01T00:00:00Z | 2       | 2       | Safari    |
+     * | 2022-01-01T00:00:00Z | 1       | 0       | Chrome    |
+     * | 2022-01-01T00:00:00Z | 0       | 4       | Firefox   |
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewRows
+     */
+    metricsViewRows: {
+      name: "MetricsViewRows",
+      I: MetricsViewRowsRequest,
+      O: MetricsViewRowsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * MetricsViewTimeRange Get the time range summaries (min, max) for time column in a metrics view.
+     * Deprecated: use MetricsViewTimeRanges instead.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewTimeRange
+     */
+    metricsViewTimeRange: {
+      name: "MetricsViewTimeRange",
+      I: MetricsViewTimeRangeRequest,
+      O: MetricsViewTimeRangeResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * MetricsViewSchema Get the data types of measures and dimensions
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewSchema
+     */
+    metricsViewSchema: {
+      name: "MetricsViewSchema",
+      I: MetricsViewSchemaRequest,
+      O: MetricsViewSchemaResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * MetricsViewSearch Get the data types of measures and dimensions
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewSearch
+     */
+    metricsViewSearch: {
+      name: "MetricsViewSearch",
+      I: MetricsViewSearchRequest,
+      O: MetricsViewSearchResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * MetricsViewTimeRanges resolves time ranges for a metrics view.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewTimeRanges
+     */
+    metricsViewTimeRanges: {
+      name: "MetricsViewTimeRanges",
+      I: MetricsViewTimeRangesRequest,
+      O: MetricsViewTimeRangesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * @generated from rpc rill.runtime.v1.QueryService.MetricsViewAnnotations
+     */
+    metricsViewAnnotations: {
+      name: "MetricsViewAnnotations",
+      I: MetricsViewAnnotationsRequest,
+      O: MetricsViewAnnotationsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ConvertExpressionToMetricsSQL converts a filter expression to a SQL filter string.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ConvertExpressionToMetricsSQL
+     */
+    convertExpressionToMetricsSQL: {
+      name: "ConvertExpressionToMetricsSQL",
+      I: ConvertExpressionToMetricsSQLRequest,
+      O: ConvertExpressionToMetricsSQLResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ResolveCanvas is a convenience API that returns a canvas and all its referenced components and metrics views.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ResolveCanvas
+     */
+    resolveCanvas: {
+      name: "ResolveCanvas",
+      I: ResolveCanvasRequest,
+      O: ResolveCanvasResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ResolveComponent resolves renderer for a Component resource.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ResolveComponent
+     */
+    resolveComponent: {
+      name: "ResolveComponent",
+      I: ResolveComponentRequest,
+      O: ResolveComponentResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ResolveTemplatedString resolves a templated strings.
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ResolveTemplatedString
+     */
+    resolveTemplatedString: {
+      name: "ResolveTemplatedString",
+      I: ResolveTemplatedStringRequest,
+      O: ResolveTemplatedStringResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * ColumnRollupInterval returns the minimum time granularity (as well as the time range) for a specified timestamp column
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnRollupInterval
+     */
+    columnRollupInterval: {
+      name: "ColumnRollupInterval",
+      I: ColumnRollupIntervalRequest,
+      O: ColumnRollupIntervalResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Get TopK elements from a table for a column given an agg function
+     * agg function and k are optional, defaults are count(*) and 50 respectively
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnTopK
+     */
+    columnTopK: {
+      name: "ColumnTopK",
+      I: ColumnTopKRequest,
+      O: ColumnTopKResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Get the number of nulls in a column
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnNullCount
+     */
+    columnNullCount: {
+      name: "ColumnNullCount",
+      I: ColumnNullCountRequest,
+      O: ColumnNullCountResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Get basic stats for a numeric column like min, max, mean, stddev, etc
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnDescriptiveStatistics
+     */
+    columnDescriptiveStatistics: {
+      name: "ColumnDescriptiveStatistics",
+      I: ColumnDescriptiveStatisticsRequest,
+      O: ColumnDescriptiveStatisticsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Estimates the smallest time grain present in the column
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnTimeGrain
+     */
+    columnTimeGrain: {
+      name: "ColumnTimeGrain",
+      I: ColumnTimeGrainRequest,
+      O: ColumnTimeGrainResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Get the histogram for values in a column
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnNumericHistogram
+     */
+    columnNumericHistogram: {
+      name: "ColumnNumericHistogram",
+      I: ColumnNumericHistogramRequest,
+      O: ColumnNumericHistogramResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Get outliers for a numeric column
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnRugHistogram
+     */
+    columnRugHistogram: {
+      name: "ColumnRugHistogram",
+      I: ColumnRugHistogramRequest,
+      O: ColumnRugHistogramResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Get the time range summaries (min, max) for a column
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnTimeRange
+     */
+    columnTimeRange: {
+      name: "ColumnTimeRange",
+      I: ColumnTimeRangeRequest,
+      O: ColumnTimeRangeResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Get cardinality for a column
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnCardinality
+     */
+    columnCardinality: {
+      name: "ColumnCardinality",
+      I: ColumnCardinalityRequest,
+      O: ColumnCardinalityResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * Generate time series for the given measures (aggregation expressions) along with the sparkline timeseries
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.ColumnTimeSeries
+     */
+    columnTimeSeries: {
+      name: "ColumnTimeSeries",
+      I: ColumnTimeSeriesRequest,
+      O: ColumnTimeSeriesResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * TableCardinality returns row count
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.TableCardinality
+     */
+    tableCardinality: {
+      name: "TableCardinality",
+      I: TableCardinalityRequest,
+      O: TableCardinalityResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * TableColumns returns column profiles
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.TableColumns
+     */
+    tableColumns: {
+      name: "TableColumns",
+      I: TableColumnsRequest,
+      O: TableColumnsResponse,
+      kind: MethodKind.Unary,
+    },
+    /**
+     * TableRows returns table rows
+     *
+     * @generated from rpc rill.runtime.v1.QueryService.TableRows
+     */
+    tableRows: {
+      name: "TableRows",
+      I: TableRowsRequest,
+      O: TableRowsResponse,
+      kind: MethodKind.Unary,
+    },
+  }
+} as const;
+
diff --git a/web-common/src/runtime-client/constants.ts b/web-common/src/runtime-client/constants.ts
index 011d0419851..521df5e4c5d 100644
--- a/web-common/src/runtime-client/constants.ts
+++ b/web-common/src/runtime-client/constants.ts
@@ -1,2 +1,8 @@
 // The TTL is actually set in the Admin server – we just use the value for some frontend logic
 export const RUNTIME_ACCESS_TOKEN_DEFAULT_TTL = 30 * 60 * 1000; // 30 minutes
+
+// Extra buffer to ensure the JWT hasn't expired by the time it reaches the server
+export const JWT_EXPIRY_WARNING_WINDOW = 2 * 1000;
+
+// Interval to recheck JWT freshness while waiting for a refresh
+export const CHECK_RUNTIME_STORE_FOR_JWT_INTERVAL = 50;
diff --git a/web-common/src/runtime-client/http-client.ts b/web-common/src/runtime-client/http-client.ts
index 6601cdc1ba9..4b5fbe140db 100644
--- a/web-common/src/runtime-client/http-client.ts
+++ b/web-common/src/runtime-client/http-client.ts
@@ -3,7 +3,11 @@ import type {
   HTTPError,
 } from "@rilldata/web-common/runtime-client/fetchWrapper";
 import { get } from "svelte/store";
-import { RUNTIME_ACCESS_TOKEN_DEFAULT_TTL } from "./constants";
+import {
+  RUNTIME_ACCESS_TOKEN_DEFAULT_TTL,
+  JWT_EXPIRY_WARNING_WINDOW,
+  CHECK_RUNTIME_STORE_FOR_JWT_INTERVAL,
+} from "./constants";
 import { HttpRequestQueue } from "./http-request-queue/HttpRequestQueue";
 import { type JWT, runtime } from "./runtime-store";
 
@@ -41,9 +45,6 @@ export const httpClient = async <T>(
   return (await httpRequestQueue.add(interceptedConfig)) as Promise<T>;
 };
 
-const JWT_EXPIRY_WARNING_WINDOW = 2 * 1000; // Extra time to ensure that the JWT is not expired when it ultimately reaches the server
-const CHECK_RUNTIME_STORE_FOR_JWT_INTERVAL = 50; // Interval to recheck JWT freshness in milliseconds
-
 /**
  * If the JWT has expired, or is close to expiring, wait for a fresh one.
  */
diff --git a/web-common/src/runtime-client/v2/RuntimeProvider.svelte b/web-common/src/runtime-client/v2/RuntimeProvider.svelte
new file mode 100644
index 00000000000..a7402a85fd0
--- /dev/null
+++ b/web-common/src/runtime-client/v2/RuntimeProvider.svelte
@@ -0,0 +1,37 @@
+<script lang="ts">
+  import { setContext, onDestroy } from "svelte";
+  import { useQueryClient } from "@tanstack/svelte-query";
+  import { RuntimeClient, type AuthContext } from "./runtime-client";
+  import { RUNTIME_CONTEXT_KEY } from "./context";
+  import { invalidateRuntimeQueries } from "../invalidation";
+  import { runtime } from "../runtime-store"; // BRIDGE (temporary)
+
+  const queryClient = useQueryClient();
+
+  export let host: string;
+  export let instanceId: string;
+  export let jwt: string | undefined = undefined;
+  export let authContext: AuthContext = "user";
+
+  // Created once per mount. If host/instanceId change, the parent's {#key} re-mounts us.
+  const client = new RuntimeClient({ host, instanceId, jwt, authContext });
+  setContext(RUNTIME_CONTEXT_KEY, client);
+
+  // Handle JWT-only changes (15-min refresh, View As with same host)
+  $: {
+    const authContextChanged = client.updateJwt(jwt, authContext);
+    if (authContextChanged)
+      void invalidateRuntimeQueries(queryClient, instanceId);
+  }
+
+  // BRIDGE (temporary): keep global store in sync for unmigrated Orval consumers
+  $: runtime
+    .setRuntime(queryClient, host, instanceId, jwt, authContext)
+    .catch(console.error);
+
+  onDestroy(() => client.dispose());
+</script>
+
+{#if host && instanceId}
+  <slot />
+{/if}
diff --git a/web-common/src/runtime-client/v2/context.ts b/web-common/src/runtime-client/v2/context.ts
new file mode 100644
index 00000000000..789bbc609a1
--- /dev/null
+++ b/web-common/src/runtime-client/v2/context.ts
@@ -0,0 +1,19 @@
+import { getContext } from "svelte";
+import type { RuntimeClient } from "./runtime-client";
+
+export const RUNTIME_CONTEXT_KEY = Symbol("runtime-client");
+
+/**
+ * Returns the RuntimeClient set by the nearest ancestor RuntimeProvider.
+ * Must be called during component initialization (top-level `<script>`).
+ */
+export function useRuntimeClient(): RuntimeClient {
+  const client = getContext<RuntimeClient | undefined>(RUNTIME_CONTEXT_KEY);
+  if (!client) {
+    throw new Error(
+      "useRuntimeClient() was called outside of a <RuntimeProvider>. " +
+        "Ensure a RuntimeProvider is an ancestor of this component.",
+    );
+  }
+  return client;
+}
diff --git a/web-common/src/runtime-client/v2/index.ts b/web-common/src/runtime-client/v2/index.ts
new file mode 100644
index 00000000000..2adf29c4649
--- /dev/null
+++ b/web-common/src/runtime-client/v2/index.ts
@@ -0,0 +1,2 @@
+export { RuntimeClient, type AuthContext } from "./runtime-client";
+export { useRuntimeClient, RUNTIME_CONTEXT_KEY } from "./context";
diff --git a/web-common/src/runtime-client/v2/runtime-client.ts b/web-common/src/runtime-client/v2/runtime-client.ts
new file mode 100644
index 00000000000..fd664a52259
--- /dev/null
+++ b/web-common/src/runtime-client/v2/runtime-client.ts
@@ -0,0 +1,115 @@
+import { createClient, type Client, type Transport } from "@connectrpc/connect";
+import { createConnectTransport } from "@connectrpc/connect-web";
+import { QueryService } from "../../proto/gen/rill/runtime/v1/queries_connect";
+import { RuntimeService } from "../../proto/gen/rill/runtime/v1/api_connect";
+import { ConnectorService } from "../../proto/gen/rill/runtime/v1/connectors_connect";
+import {
+  RUNTIME_ACCESS_TOKEN_DEFAULT_TTL,
+  JWT_EXPIRY_WARNING_WINDOW,
+  CHECK_RUNTIME_STORE_FOR_JWT_INTERVAL,
+} from "../constants";
+
+export type AuthContext = "user" | "mock" | "magic" | "embed";
+
+export class RuntimeClient {
+  readonly instanceId: string;
+  readonly transport: Transport;
+
+  // JWT state (mutable; read by the transport interceptor)
+  private currentJwt: string | undefined;
+  private jwtReceivedAt: number;
+  private authContext: AuthContext;
+
+  // Cached service clients (created once per RuntimeClient)
+  private _queryService: Client<typeof QueryService> | null = null;
+  private _runtimeService: Client<typeof RuntimeService> | null = null;
+  private _connectorService: Client<typeof ConnectorService> | null = null;
+
+  constructor(opts: {
+    host: string;
+    instanceId: string;
+    jwt?: string;
+    authContext?: AuthContext;
+  }) {
+    this.instanceId = opts.instanceId;
+    this.currentJwt = opts.jwt;
+    this.jwtReceivedAt = opts.jwt ? Date.now() : 0;
+    this.authContext = opts.authContext ?? "user";
+
+    this.transport = createConnectTransport({
+      baseUrl: opts.host,
+      interceptors: [
+        (next) => async (req) => {
+          if (this.currentJwt) {
+            await this.waitForFreshJwt();
+            req.header.set("Authorization", `Bearer ${this.currentJwt}`);
+          }
+          return next(req);
+        },
+      ],
+    });
+  }
+
+  /**
+   * Called by RuntimeProvider when the parent passes a new JWT prop.
+   * Returns true if the auth context changed (caller should invalidate queries).
+   */
+  updateJwt(jwt: string | undefined, authContext?: AuthContext): boolean {
+    const authContextChanged =
+      !!this.authContext && !!authContext && authContext !== this.authContext;
+
+    if (jwt !== this.currentJwt) {
+      this.currentJwt = jwt;
+      this.jwtReceivedAt = Date.now();
+    }
+    if (authContext) this.authContext = authContext;
+
+    return authContextChanged;
+  }
+
+  /** Returns the current JWT (used by SSE clients and other non-query consumers). */
+  getJwt(): string | undefined {
+    return this.currentJwt;
+  }
+
+  get queryService() {
+    return (this._queryService ??= createClient(QueryService, this.transport));
+  }
+
+  get runtimeService() {
+    return (this._runtimeService ??= createClient(
+      RuntimeService,
+      this.transport,
+    ));
+  }
+
+  get connectorService() {
+    return (this._connectorService ??= createClient(
+      ConnectorService,
+      this.transport,
+    ));
+  }
+
+  /**
+   * If the JWT is close to expiring, wait in a polling loop for
+   * RuntimeProvider to call updateJwt() with a fresh token.
+   * Ported from http-client.ts:maybeWaitForFreshJWT.
+   */
+  private async waitForFreshJwt(): Promise<void> {
+    // Embeds have a 24h backend-issued TTL; skip client-side expiry check
+    if (this.authContext === "embed") return;
+
+    let expiresAt = this.jwtReceivedAt + RUNTIME_ACCESS_TOKEN_DEFAULT_TTL;
+    while (Date.now() + JWT_EXPIRY_WARNING_WINDOW > expiresAt) {
+      await new Promise((r) =>
+        setTimeout(r, CHECK_RUNTIME_STORE_FOR_JWT_INTERVAL),
+      );
+      // Re-check: provider may have called updateJwt() while we waited
+      expiresAt = this.jwtReceivedAt + RUNTIME_ACCESS_TOKEN_DEFAULT_TTL;
+    }
+  }
+
+  dispose(): void {
+    // Future: clean up SSE connections, cancel pending requests
+  }
+}
diff --git a/web-local/src/routes/+layout.svelte b/web-local/src/routes/+layout.svelte
index 5550cf3a293..1dea30d3395 100644
--- a/web-local/src/routes/+layout.svelte
+++ b/web-local/src/routes/+layout.svelte
@@ -22,6 +22,7 @@
   } from "@rilldata/web-common/metrics/initMetrics";
   import { localServiceGetMetadata } from "@rilldata/web-common/runtime-client/local-service";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import RuntimeProvider from "@rilldata/web-common/runtime-client/v2/RuntimeProvider.svelte";
   import type { Query } from "@tanstack/query-core";
   import { QueryClientProvider } from "@tanstack/svelte-query";
   import type { AxiosError } from "axios";
@@ -77,20 +78,24 @@
 </script>
 
 <QueryClientProvider client={queryClient}>
-  <FileAndResourceWatcher {host} {instanceId}>
-    <div class="body h-screen w-screen overflow-hidden absolute flex flex-col">
-      {#if data.initialized}
-        <BannerCenter />
-        <RepresentingUserBanner />
-        <ApplicationHeader {mode} />
-        {#if $deploy}
-          <RemoteProjectManager />
+  <RuntimeProvider {host} {instanceId}>
+    <FileAndResourceWatcher {host} {instanceId}>
+      <div
+        class="body h-screen w-screen overflow-hidden absolute flex flex-col"
+      >
+        {#if data.initialized}
+          <BannerCenter />
+          <RepresentingUserBanner />
+          <ApplicationHeader {mode} />
+          {#if $deploy}
+            <RemoteProjectManager />
+          {/if}
         {/if}
-      {/if}
 
-      <slot />
-    </div>
-  </FileAndResourceWatcher>
+        <slot />
+      </div>
+    </FileAndResourceWatcher>
+  </RuntimeProvider>
 </QueryClientProvider>
 
 {#if $overlay !== null}

From ba367e847fb5e1f547ad91a61518e71af783b028 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 11:37:11 +0300
Subject: [PATCH 02/27] feat: add TanStack Query hook code generator (Phase 2)

Add a build-time code generator that reads ConnectRPC *_connect.ts
service descriptors and produces TanStack Query hooks for Svelte.

For each unary query method, generates 4 tiers: raw RPC function,
query key factory, query options factory, and convenience createQuery
hook. Mutation methods get 3 tiers: raw function, mutation options,
and createMutation hook.

Output: 59 queries + 28 mutations across QueryService, RuntimeService,
and ConnectorService. Streaming methods (watchFiles, watchResources,
watchLogs, completeStreaming, queryBatch) are skipped.

Generated hooks take RuntimeClient as first argument and inject
instanceId automatically, matching the Phase 1 context architecture.
---
 Makefile                                      |    1 +
 web-common/package.json                       |    1 +
 .../scripts/generate-query-hooks-config.ts    |   81 +
 web-common/scripts/generate-query-hooks.ts    |  363 ++
 .../v2/gen/connector-service.ts               |  462 +++
 web-common/src/runtime-client/v2/gen/index.ts |    5 +
 .../runtime-client/v2/gen/query-service.ts    | 2001 +++++++++++
 .../runtime-client/v2/gen/runtime-service.ts  | 2934 +++++++++++++++++
 8 files changed, 5848 insertions(+)
 create mode 100644 web-common/scripts/generate-query-hooks-config.ts
 create mode 100644 web-common/scripts/generate-query-hooks.ts
 create mode 100644 web-common/src/runtime-client/v2/gen/connector-service.ts
 create mode 100644 web-common/src/runtime-client/v2/gen/index.ts
 create mode 100644 web-common/src/runtime-client/v2/gen/query-service.ts
 create mode 100644 web-common/src/runtime-client/v2/gen/runtime-service.ts

diff --git a/Makefile b/Makefile
index 0e046eba401..35827f4c95c 100644
--- a/Makefile
+++ b/Makefile
@@ -66,5 +66,6 @@ proto.generate:
 		scripts/convert-openapi-v2-to-v3/convert.go --force --public-only \
 		proto/gen/rill/admin/v1/admin.swagger.yaml proto/gen/rill/admin/v1/public.openapi.yaml
 	npm run generate:runtime-client -w web-common
+	npm run generate:query-hooks -w web-common
 	npm run generate:client -w web-admin
 	
\ No newline at end of file
diff --git a/web-common/package.json b/web-common/package.json
index 9b89aa91a61..877ccad2a26 100644
--- a/web-common/package.json
+++ b/web-common/package.json
@@ -6,6 +6,7 @@
     "lint": "prettier --check . && eslint .",
     "format": "prettier --write .",
     "generate:runtime-client": "svelte-kit sync && orval --config ./orval.config.ts",
+    "generate:query-hooks": "tsx scripts/generate-query-hooks.ts",
     "generate:sveltekit": "svelte-kit sync",
     "generate:template-schema": "ts-json-schema-generator --path 'src/features/canvas/components/types.ts' --type TemplateSpec -o ../runtime/parser/data/component-template-v1.json",
     "test": "vitest run",
diff --git a/web-common/scripts/generate-query-hooks-config.ts b/web-common/scripts/generate-query-hooks-config.ts
new file mode 100644
index 00000000000..9d933431938
--- /dev/null
+++ b/web-common/scripts/generate-query-hooks-config.ts
@@ -0,0 +1,81 @@
+/**
+ * Classification config for the query hooks code generator.
+ * Determines whether each RPC method produces a query or mutation hook,
+ * or should be skipped entirely (streaming methods).
+ */
+
+export type MethodClassification = "query" | "mutation" | "skip";
+
+/**
+ * Per-service overrides. Methods not listed here fall through to the
+ * service-level default classifier.
+ */
+export const methodOverrides: Record<
+  string,
+  Record<string, MethodClassification>
+> = {
+  QueryService: {
+    // Semantically write operations
+    export: "mutation",
+    exportReport: "mutation",
+    query: "mutation",
+    // Streaming
+    queryBatch: "skip",
+  },
+  RuntimeService: {
+    // Streaming
+    watchFiles: "skip",
+    watchLogs: "skip",
+    watchResources: "skip",
+    completeStreaming: "skip",
+    // Explicitly classified as queries (despite not matching Get/List prefix)
+    issueDevJWT: "query",
+    analyzeConnectors: "query",
+    analyzeVariables: "query",
+    queryResolver: "query",
+  },
+  ConnectorService: {
+    // All methods are queries (no overrides needed)
+  },
+};
+
+/**
+ * Default classifier for methods not in the override map.
+ * RuntimeService uses prefix-based classification; other services default to query.
+ */
+export function classifyMethod(
+  serviceName: string,
+  methodName: string,
+): MethodClassification {
+  // Check overrides first
+  const overrides = methodOverrides[serviceName];
+  if (overrides && methodName in overrides) {
+    return overrides[methodName];
+  }
+
+  // Service-specific defaults
+  if (serviceName === "RuntimeService") {
+    const queryPrefixes = [
+      "get",
+      "list",
+      "ping",
+      "health",
+      "instanceHealth",
+    ];
+    const lowerMethod = methodName.charAt(0).toLowerCase() + methodName.slice(1);
+    if (queryPrefixes.some((p) => lowerMethod.startsWith(p))) {
+      return "query";
+    }
+    return "mutation";
+  }
+
+  if (serviceName === "QueryService") {
+    return "query";
+  }
+
+  if (serviceName === "ConnectorService") {
+    return "query";
+  }
+
+  return "query";
+}
diff --git a/web-common/scripts/generate-query-hooks.ts b/web-common/scripts/generate-query-hooks.ts
new file mode 100644
index 00000000000..d5667e573fe
--- /dev/null
+++ b/web-common/scripts/generate-query-hooks.ts
@@ -0,0 +1,363 @@
+/**
+ * Code generator: reads ConnectRPC *_connect.ts service descriptors and
+ * produces TanStack Query hooks for Svelte.
+ *
+ * Usage: tsx scripts/generate-query-hooks.ts
+ *
+ * Output: src/runtime-client/v2/gen/{query-service,runtime-service,connector-service}.ts
+ */
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+import { MethodKind } from "@bufbuild/protobuf";
+import { classifyMethod, type MethodClassification } from "./generate-query-hooks-config";
+
+// --- Service descriptors ---
+
+import { QueryService } from "../src/proto/gen/rill/runtime/v1/queries_connect";
+import { RuntimeService } from "../src/proto/gen/rill/runtime/v1/api_connect";
+import { ConnectorService } from "../src/proto/gen/rill/runtime/v1/connectors_connect";
+
+interface ServiceDef {
+  typeName: string;
+  methods: Record<
+    string,
+    {
+      name: string;
+      I: { typeName: string };
+      O: { typeName: string };
+      kind: MethodKind;
+    }
+  >;
+}
+
+interface MethodInfo {
+  /** camelCase method name as it appears in the service descriptor (e.g. "metricsViewAggregation") */
+  methodKey: string;
+  /** PascalCase method name from the proto (e.g. "MetricsViewAggregation") */
+  methodName: string;
+  /** Request message type name (e.g. "MetricsViewAggregationRequest") */
+  inputType: string;
+  /** Response message type name (e.g. "MetricsViewAggregationResponse") */
+  outputType: string;
+  classification: MethodClassification;
+}
+
+// --- Helpers ---
+
+function pascalCase(s: string): string {
+  return s.charAt(0).toUpperCase() + s.slice(1);
+}
+
+function extractShortName(typeName: string): string {
+  // "rill.runtime.v1.MetricsViewAggregationRequest" -> "MetricsViewAggregationRequest"
+  const parts = typeName.split(".");
+  return parts[parts.length - 1];
+}
+
+function getServiceShortName(typeName: string): string {
+  // "rill.runtime.v1.QueryService" -> "QueryService"
+  return extractShortName(typeName);
+}
+
+function getServiceClientProp(serviceName: string): string {
+  // "QueryService" -> "queryService", "RuntimeService" -> "runtimeService"
+  return serviceName.charAt(0).toLowerCase() + serviceName.slice(1);
+}
+
+/** kebab-case for output filename */
+function toKebabCase(s: string): string {
+  return s
+    .replace(/([a-z])([A-Z])/g, "$1-$2")
+    .replace(/([A-Z])([A-Z][a-z])/g, "$1-$2")
+    .toLowerCase();
+}
+
+/** Derive the _pb.ts module path that exports the request/response types */
+function getProtoImportPath(serviceName: string): string {
+  const fileMap: Record<string, string> = {
+    QueryService: "queries_pb",
+    RuntimeService: "api_pb",
+    ConnectorService: "connectors_pb",
+  };
+  return `../../../proto/gen/rill/runtime/v1/${fileMap[serviceName]}`;
+}
+
+// --- Method extraction ---
+
+function extractMethods(service: ServiceDef): MethodInfo[] {
+  const serviceName = getServiceShortName(service.typeName);
+  const methods: MethodInfo[] = [];
+
+  for (const [key, method] of Object.entries(service.methods)) {
+    if (method.kind !== MethodKind.Unary) {
+      // Skip streaming methods automatically
+      continue;
+    }
+
+    const classification = classifyMethod(serviceName, key);
+    if (classification === "skip") continue;
+
+    methods.push({
+      methodKey: key,
+      methodName: method.name,
+      inputType: extractShortName(method.I.typeName),
+      outputType: extractShortName(method.O.typeName),
+      classification,
+    });
+  }
+
+  return methods;
+}
+
+// --- Code generation ---
+
+function generateServiceFile(service: ServiceDef): string {
+  const serviceName = getServiceShortName(service.typeName);
+  const serviceClientProp = getServiceClientProp(serviceName);
+  const protoImportPath = getProtoImportPath(serviceName);
+  const methods = extractMethods(service);
+
+  const queryMethods = methods.filter((m) => m.classification === "query");
+  const mutationMethods = methods.filter(
+    (m) => m.classification === "mutation",
+  );
+
+  // Collect all request/response types we need to import
+  const protoTypes = new Set<string>();
+  for (const m of methods) {
+    protoTypes.add(m.inputType);
+    protoTypes.add(m.outputType);
+  }
+
+  const lines: string[] = [];
+
+  // Header
+  lines.push(`// Generated by generate-query-hooks.ts — DO NOT EDIT`);
+  lines.push(``);
+  lines.push(`import type { RuntimeClient } from "../runtime-client";`);
+  lines.push(
+    `import type { PartialMessage } from "@bufbuild/protobuf";`,
+  );
+  lines.push(
+    `import {`,
+    `  createQuery,`,
+    `  createMutation,`,
+    `  type CreateQueryOptions,`,
+    `  type CreateQueryResult,`,
+    `  type QueryClient,`,
+    `  type QueryFunction,`,
+    `  type QueryKey,`,
+    `  type CreateMutationOptions,`,
+    `  type CreateMutationResult,`,
+    `} from "@tanstack/svelte-query";`,
+  );
+
+  // Proto type imports
+  const sortedTypes = [...protoTypes].sort();
+  lines.push(
+    `import {`,
+    ...sortedTypes.map((t, i) =>
+      `  ${t}${i < sortedTypes.length - 1 ? "," : ""}`,
+    ),
+    `} from "${protoImportPath}";`,
+  );
+
+  lines.push(``);
+
+  // --- Query methods ---
+  for (const m of queryMethods) {
+    const fnPrefix = `${serviceClientProp.charAt(0).toLowerCase() + serviceClientProp.slice(1)}${pascalCase(m.methodKey)}`;
+    // Use the same naming convention: serviceName + methodName (e.g. queryServiceMetricsViewAggregation)
+
+    const fullName = `${serviceClientProp}${pascalCase(m.methodKey)}`;
+    const keyFnName = `get${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}QueryKey`;
+    const optsFnName = `get${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}QueryOptions`;
+    const hookName = `create${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}`;
+
+    // Tier 1: Raw function
+    lines.push(
+      `/**`,
+      ` * Raw RPC call: ${serviceName}.${m.methodName}`,
+      ` */`,
+      `export function ${fullName}(`,
+      `  client: RuntimeClient,`,
+      `  request: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `  options?: { signal?: AbortSignal },`,
+      `): Promise<${m.outputType}> {`,
+      `  return client.${serviceClientProp}.${m.methodKey}(`,
+      `    { instanceId: client.instanceId, ...request },`,
+      `    { signal: options?.signal },`,
+      `  );`,
+      `}`,
+      ``,
+    );
+
+    // Tier 2: Query key
+    lines.push(
+      `export function ${keyFnName}(`,
+      `  instanceId: string,`,
+      `  request?: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `): QueryKey {`,
+      `  return ["${serviceName}", "${m.methodKey}", instanceId, request ?? {}] as const;`,
+      `}`,
+      ``,
+    );
+
+    // Tier 3: Query options
+    lines.push(
+      `export function ${optsFnName}(`,
+      `  client: RuntimeClient,`,
+      `  request: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `  options?: {`,
+      `    query?: Partial<CreateQueryOptions<${m.outputType}>>;`,
+      `  },`,
+      `): CreateQueryOptions<${m.outputType}> & { queryKey: QueryKey } {`,
+      `  const queryKey = ${keyFnName}(client.instanceId, request);`,
+      `  const queryFn: QueryFunction<${m.outputType}> = ({ signal }) =>`,
+      `    ${fullName}(client, request, { signal });`,
+      `  return {`,
+      `    queryKey,`,
+      `    queryFn,`,
+      `    enabled: !!client.instanceId,`,
+      `    ...options?.query,`,
+      `  };`,
+      `}`,
+      ``,
+    );
+
+    // Tier 4: Convenience hook
+    lines.push(
+      `export function ${hookName}(`,
+      `  client: RuntimeClient,`,
+      `  request: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `  options?: {`,
+      `    query?: Partial<CreateQueryOptions<${m.outputType}>>;`,
+      `  },`,
+      `  queryClient?: QueryClient,`,
+      `): CreateQueryResult<${m.outputType}> {`,
+      `  const queryOptions = ${optsFnName}(client, request, options);`,
+      `  return createQuery(queryOptions, queryClient);`,
+      `}`,
+      ``,
+    );
+  }
+
+  // --- Mutation methods ---
+  for (const m of mutationMethods) {
+    const fullName = `${serviceClientProp}${pascalCase(m.methodKey)}`;
+    const mutOptsFnName = `get${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}MutationOptions`;
+    const mutHookName = `create${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}Mutation`;
+
+    // Raw function
+    lines.push(
+      `/**`,
+      ` * Raw RPC call (mutation): ${serviceName}.${m.methodName}`,
+      ` */`,
+      `export function ${fullName}(`,
+      `  client: RuntimeClient,`,
+      `  request: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `): Promise<${m.outputType}> {`,
+      `  return client.${serviceClientProp}.${m.methodKey}(`,
+      `    { instanceId: client.instanceId, ...request },`,
+      `  );`,
+      `}`,
+      ``,
+    );
+
+    // Mutation options
+    lines.push(
+      `export function ${mutOptsFnName}(`,
+      `  client: RuntimeClient,`,
+      `  options?: Partial<CreateMutationOptions<${m.outputType}, unknown, PartialMessage<Omit<${m.inputType}, "instanceId">>>>,`,
+      `): CreateMutationOptions<${m.outputType}, unknown, PartialMessage<Omit<${m.inputType}, "instanceId">>> {`,
+      `  return {`,
+      `    mutationFn: (request) => ${fullName}(client, request),`,
+      `    ...options,`,
+      `  };`,
+      `}`,
+      ``,
+    );
+
+    // Mutation hook
+    lines.push(
+      `export function ${mutHookName}(`,
+      `  client: RuntimeClient,`,
+      `  options?: Partial<CreateMutationOptions<${m.outputType}, unknown, PartialMessage<Omit<${m.inputType}, "instanceId">>>>,`,
+      `  queryClient?: QueryClient,`,
+      `): CreateMutationResult<${m.outputType}, unknown, PartialMessage<Omit<${m.inputType}, "instanceId">>> {`,
+      `  const mutationOptions = ${mutOptsFnName}(client, options);`,
+      `  return createMutation(mutationOptions, queryClient);`,
+      `}`,
+      ``,
+    );
+  }
+
+  return lines.join("\n");
+}
+
+function generateIndex(serviceNames: string[]): string {
+  const lines = [`// Generated by generate-query-hooks.ts — DO NOT EDIT`, ``];
+  for (const name of serviceNames) {
+    lines.push(`export * from "./${toKebabCase(name)}";`);
+  }
+  lines.push(``);
+  return lines.join("\n");
+}
+
+// --- Main ---
+
+const outDir = path.resolve(
+  __dirname,
+  "../src/runtime-client/v2/gen",
+);
+
+fs.mkdirSync(outDir, { recursive: true });
+
+const services: { descriptor: ServiceDef; name: string }[] = [
+  { descriptor: QueryService as unknown as ServiceDef, name: "QueryService" },
+  {
+    descriptor: RuntimeService as unknown as ServiceDef,
+    name: "RuntimeService",
+  },
+  {
+    descriptor: ConnectorService as unknown as ServiceDef,
+    name: "ConnectorService",
+  },
+];
+
+let totalQueries = 0;
+let totalMutations = 0;
+
+for (const { descriptor, name } of services) {
+  const code = generateServiceFile(descriptor);
+  const fileName = `${toKebabCase(name)}.ts`;
+  const filePath = path.join(outDir, fileName);
+  fs.writeFileSync(filePath, code);
+
+  const methods = extractMethods(descriptor);
+  const queries = methods.filter((m) => m.classification === "query").length;
+  const mutations = methods.filter(
+    (m) => m.classification === "mutation",
+  ).length;
+  const skipped = Object.keys(descriptor.methods).length - methods.length;
+  totalQueries += queries;
+  totalMutations += mutations;
+
+  console.log(
+    `  ${fileName}: ${queries} queries, ${mutations} mutations, ${skipped} skipped`,
+  );
+}
+
+// Generate barrel index
+const indexCode = generateIndex(services.map((s) => s.name));
+fs.writeFileSync(path.join(outDir, "index.ts"), indexCode);
+
+console.log(
+  `\nTotal: ${totalQueries} queries, ${totalMutations} mutations`,
+);
+console.log(`Output: ${outDir}`);
diff --git a/web-common/src/runtime-client/v2/gen/connector-service.ts b/web-common/src/runtime-client/v2/gen/connector-service.ts
new file mode 100644
index 00000000000..f8006491856
--- /dev/null
+++ b/web-common/src/runtime-client/v2/gen/connector-service.ts
@@ -0,0 +1,462 @@
+// Generated by generate-query-hooks.ts — DO NOT EDIT
+
+import type { RuntimeClient } from "../runtime-client";
+import type { PartialMessage } from "@bufbuild/protobuf";
+import {
+  createQuery,
+  createMutation,
+  type CreateQueryOptions,
+  type CreateQueryResult,
+  type QueryClient,
+  type QueryFunction,
+  type QueryKey,
+  type CreateMutationOptions,
+  type CreateMutationResult,
+} from "@tanstack/svelte-query";
+import {
+  GetTableRequest,
+  GetTableResponse,
+  ListBucketsRequest,
+  ListBucketsResponse,
+  ListDatabaseSchemasRequest,
+  ListDatabaseSchemasResponse,
+  ListObjectsRequest,
+  ListObjectsResponse,
+  ListTablesRequest,
+  ListTablesResponse,
+  OLAPGetTableRequest,
+  OLAPGetTableResponse,
+  OLAPListTablesRequest,
+  OLAPListTablesResponse,
+} from "../../../proto/gen/rill/runtime/v1/connectors_pb";
+
+/**
+ * Raw RPC call: ConnectorService.ListBuckets
+ */
+export function connectorServiceListBuckets(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListBucketsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListBucketsResponse> {
+  return client.connectorService.listBuckets(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getConnectorServiceListBucketsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListBucketsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "ConnectorService",
+    "listBuckets",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getConnectorServiceListBucketsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListBucketsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListBucketsResponse>>;
+  },
+): CreateQueryOptions<ListBucketsResponse> & { queryKey: QueryKey } {
+  const queryKey = getConnectorServiceListBucketsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListBucketsResponse> = ({ signal }) =>
+    connectorServiceListBuckets(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createConnectorServiceListBuckets(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListBucketsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListBucketsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListBucketsResponse> {
+  const queryOptions = getConnectorServiceListBucketsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: ConnectorService.ListObjects
+ */
+export function connectorServiceListObjects(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListObjectsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListObjectsResponse> {
+  return client.connectorService.listObjects(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getConnectorServiceListObjectsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListObjectsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "ConnectorService",
+    "listObjects",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getConnectorServiceListObjectsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListObjectsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListObjectsResponse>>;
+  },
+): CreateQueryOptions<ListObjectsResponse> & { queryKey: QueryKey } {
+  const queryKey = getConnectorServiceListObjectsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListObjectsResponse> = ({ signal }) =>
+    connectorServiceListObjects(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createConnectorServiceListObjects(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListObjectsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListObjectsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListObjectsResponse> {
+  const queryOptions = getConnectorServiceListObjectsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: ConnectorService.OLAPListTables
+ */
+export function connectorServiceOLAPListTables(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<OLAPListTablesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<OLAPListTablesResponse> {
+  return client.connectorService.oLAPListTables(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getConnectorServiceOLAPListTablesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<OLAPListTablesRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "ConnectorService",
+    "oLAPListTables",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getConnectorServiceOLAPListTablesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<OLAPListTablesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<OLAPListTablesResponse>>;
+  },
+): CreateQueryOptions<OLAPListTablesResponse> & { queryKey: QueryKey } {
+  const queryKey = getConnectorServiceOLAPListTablesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<OLAPListTablesResponse> = ({ signal }) =>
+    connectorServiceOLAPListTables(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createConnectorServiceOLAPListTables(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<OLAPListTablesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<OLAPListTablesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<OLAPListTablesResponse> {
+  const queryOptions = getConnectorServiceOLAPListTablesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: ConnectorService.OLAPGetTable
+ */
+export function connectorServiceOLAPGetTable(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<OLAPGetTableRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<OLAPGetTableResponse> {
+  return client.connectorService.oLAPGetTable(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getConnectorServiceOLAPGetTableQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<OLAPGetTableRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "ConnectorService",
+    "oLAPGetTable",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getConnectorServiceOLAPGetTableQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<OLAPGetTableRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<OLAPGetTableResponse>>;
+  },
+): CreateQueryOptions<OLAPGetTableResponse> & { queryKey: QueryKey } {
+  const queryKey = getConnectorServiceOLAPGetTableQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<OLAPGetTableResponse> = ({ signal }) =>
+    connectorServiceOLAPGetTable(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createConnectorServiceOLAPGetTable(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<OLAPGetTableRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<OLAPGetTableResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<OLAPGetTableResponse> {
+  const queryOptions = getConnectorServiceOLAPGetTableQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: ConnectorService.ListDatabaseSchemas
+ */
+export function connectorServiceListDatabaseSchemas(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListDatabaseSchemasRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListDatabaseSchemasResponse> {
+  return client.connectorService.listDatabaseSchemas(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getConnectorServiceListDatabaseSchemasQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListDatabaseSchemasRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "ConnectorService",
+    "listDatabaseSchemas",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getConnectorServiceListDatabaseSchemasQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListDatabaseSchemasRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListDatabaseSchemasResponse>>;
+  },
+): CreateQueryOptions<ListDatabaseSchemasResponse> & { queryKey: QueryKey } {
+  const queryKey = getConnectorServiceListDatabaseSchemasQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListDatabaseSchemasResponse> = ({ signal }) =>
+    connectorServiceListDatabaseSchemas(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createConnectorServiceListDatabaseSchemas(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListDatabaseSchemasRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListDatabaseSchemasResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListDatabaseSchemasResponse> {
+  const queryOptions = getConnectorServiceListDatabaseSchemasQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: ConnectorService.ListTables
+ */
+export function connectorServiceListTables(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListTablesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListTablesResponse> {
+  return client.connectorService.listTables(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getConnectorServiceListTablesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListTablesRequest, "instanceId">>,
+): QueryKey {
+  return ["ConnectorService", "listTables", instanceId, request ?? {}] as const;
+}
+
+export function getConnectorServiceListTablesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListTablesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListTablesResponse>>;
+  },
+): CreateQueryOptions<ListTablesResponse> & { queryKey: QueryKey } {
+  const queryKey = getConnectorServiceListTablesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListTablesResponse> = ({ signal }) =>
+    connectorServiceListTables(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createConnectorServiceListTables(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListTablesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListTablesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListTablesResponse> {
+  const queryOptions = getConnectorServiceListTablesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: ConnectorService.GetTable
+ */
+export function connectorServiceGetTable(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetTableRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<GetTableResponse> {
+  return client.connectorService.getTable(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getConnectorServiceGetTableQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<GetTableRequest, "instanceId">>,
+): QueryKey {
+  return ["ConnectorService", "getTable", instanceId, request ?? {}] as const;
+}
+
+export function getConnectorServiceGetTableQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetTableRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetTableResponse>>;
+  },
+): CreateQueryOptions<GetTableResponse> & { queryKey: QueryKey } {
+  const queryKey = getConnectorServiceGetTableQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<GetTableResponse> = ({ signal }) =>
+    connectorServiceGetTable(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createConnectorServiceGetTable(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetTableRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetTableResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<GetTableResponse> {
+  const queryOptions = getConnectorServiceGetTableQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
diff --git a/web-common/src/runtime-client/v2/gen/index.ts b/web-common/src/runtime-client/v2/gen/index.ts
new file mode 100644
index 00000000000..a7cf632e105
--- /dev/null
+++ b/web-common/src/runtime-client/v2/gen/index.ts
@@ -0,0 +1,5 @@
+// Generated by generate-query-hooks.ts — DO NOT EDIT
+
+export * from "./query-service";
+export * from "./runtime-service";
+export * from "./connector-service";
diff --git a/web-common/src/runtime-client/v2/gen/query-service.ts b/web-common/src/runtime-client/v2/gen/query-service.ts
new file mode 100644
index 00000000000..0945495cf0f
--- /dev/null
+++ b/web-common/src/runtime-client/v2/gen/query-service.ts
@@ -0,0 +1,2001 @@
+// Generated by generate-query-hooks.ts — DO NOT EDIT
+
+import type { RuntimeClient } from "../runtime-client";
+import type { PartialMessage } from "@bufbuild/protobuf";
+import {
+  createQuery,
+  createMutation,
+  type CreateQueryOptions,
+  type CreateQueryResult,
+  type QueryClient,
+  type QueryFunction,
+  type QueryKey,
+  type CreateMutationOptions,
+  type CreateMutationResult,
+} from "@tanstack/svelte-query";
+import {
+  ColumnCardinalityRequest,
+  ColumnCardinalityResponse,
+  ColumnDescriptiveStatisticsRequest,
+  ColumnDescriptiveStatisticsResponse,
+  ColumnNullCountRequest,
+  ColumnNullCountResponse,
+  ColumnNumericHistogramRequest,
+  ColumnNumericHistogramResponse,
+  ColumnRollupIntervalRequest,
+  ColumnRollupIntervalResponse,
+  ColumnRugHistogramRequest,
+  ColumnRugHistogramResponse,
+  ColumnTimeGrainRequest,
+  ColumnTimeGrainResponse,
+  ColumnTimeRangeRequest,
+  ColumnTimeRangeResponse,
+  ColumnTimeSeriesRequest,
+  ColumnTimeSeriesResponse,
+  ColumnTopKRequest,
+  ColumnTopKResponse,
+  ConvertExpressionToMetricsSQLRequest,
+  ConvertExpressionToMetricsSQLResponse,
+  ExportReportRequest,
+  ExportReportResponse,
+  ExportRequest,
+  ExportResponse,
+  MetricsViewAggregationRequest,
+  MetricsViewAggregationResponse,
+  MetricsViewAnnotationsRequest,
+  MetricsViewAnnotationsResponse,
+  MetricsViewComparisonRequest,
+  MetricsViewComparisonResponse,
+  MetricsViewRowsRequest,
+  MetricsViewRowsResponse,
+  MetricsViewSchemaRequest,
+  MetricsViewSchemaResponse,
+  MetricsViewSearchRequest,
+  MetricsViewSearchResponse,
+  MetricsViewTimeRangeRequest,
+  MetricsViewTimeRangeResponse,
+  MetricsViewTimeRangesRequest,
+  MetricsViewTimeRangesResponse,
+  MetricsViewTimeSeriesRequest,
+  MetricsViewTimeSeriesResponse,
+  MetricsViewToplistRequest,
+  MetricsViewToplistResponse,
+  MetricsViewTotalsRequest,
+  MetricsViewTotalsResponse,
+  QueryRequest,
+  QueryResponse,
+  ResolveCanvasRequest,
+  ResolveCanvasResponse,
+  ResolveComponentRequest,
+  ResolveComponentResponse,
+  ResolveTemplatedStringRequest,
+  ResolveTemplatedStringResponse,
+  TableCardinalityRequest,
+  TableCardinalityResponse,
+  TableColumnsRequest,
+  TableColumnsResponse,
+  TableRowsRequest,
+  TableRowsResponse,
+} from "../../../proto/gen/rill/runtime/v1/queries_pb";
+
+/**
+ * Raw RPC call: QueryService.MetricsViewAggregation
+ */
+export function queryServiceMetricsViewAggregation(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewAggregationRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewAggregationResponse> {
+  return client.queryService.metricsViewAggregation(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewAggregationQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewAggregationRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewAggregation",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewAggregationQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewAggregationRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewAggregationResponse>>;
+  },
+): CreateQueryOptions<MetricsViewAggregationResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewAggregationQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewAggregationResponse> = ({ signal }) =>
+    queryServiceMetricsViewAggregation(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewAggregation(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewAggregationRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewAggregationResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewAggregationResponse> {
+  const queryOptions = getQueryServiceMetricsViewAggregationQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewToplist
+ */
+export function queryServiceMetricsViewToplist(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewToplistRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewToplistResponse> {
+  return client.queryService.metricsViewToplist(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewToplistQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewToplistRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewToplist",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewToplistQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewToplistRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewToplistResponse>>;
+  },
+): CreateQueryOptions<MetricsViewToplistResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewToplistQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewToplistResponse> = ({ signal }) =>
+    queryServiceMetricsViewToplist(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewToplist(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewToplistRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewToplistResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewToplistResponse> {
+  const queryOptions = getQueryServiceMetricsViewToplistQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewComparison
+ */
+export function queryServiceMetricsViewComparison(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewComparisonRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewComparisonResponse> {
+  return client.queryService.metricsViewComparison(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewComparisonQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewComparisonRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewComparison",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewComparisonQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewComparisonRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewComparisonResponse>>;
+  },
+): CreateQueryOptions<MetricsViewComparisonResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewComparisonQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewComparisonResponse> = ({ signal }) =>
+    queryServiceMetricsViewComparison(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewComparison(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewComparisonRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewComparisonResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewComparisonResponse> {
+  const queryOptions = getQueryServiceMetricsViewComparisonQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewTimeSeries
+ */
+export function queryServiceMetricsViewTimeSeries(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeSeriesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewTimeSeriesResponse> {
+  return client.queryService.metricsViewTimeSeries(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewTimeSeriesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewTimeSeriesRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewTimeSeries",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewTimeSeriesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeSeriesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewTimeSeriesResponse>>;
+  },
+): CreateQueryOptions<MetricsViewTimeSeriesResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewTimeSeriesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewTimeSeriesResponse> = ({ signal }) =>
+    queryServiceMetricsViewTimeSeries(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewTimeSeries(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeSeriesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewTimeSeriesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewTimeSeriesResponse> {
+  const queryOptions = getQueryServiceMetricsViewTimeSeriesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewTotals
+ */
+export function queryServiceMetricsViewTotals(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTotalsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewTotalsResponse> {
+  return client.queryService.metricsViewTotals(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewTotalsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewTotalsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewTotals",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewTotalsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTotalsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewTotalsResponse>>;
+  },
+): CreateQueryOptions<MetricsViewTotalsResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewTotalsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewTotalsResponse> = ({ signal }) =>
+    queryServiceMetricsViewTotals(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewTotals(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTotalsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewTotalsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewTotalsResponse> {
+  const queryOptions = getQueryServiceMetricsViewTotalsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewRows
+ */
+export function queryServiceMetricsViewRows(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewRowsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewRowsResponse> {
+  return client.queryService.metricsViewRows(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewRowsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewRowsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewRows",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewRowsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewRowsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewRowsResponse>>;
+  },
+): CreateQueryOptions<MetricsViewRowsResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewRowsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewRowsResponse> = ({ signal }) =>
+    queryServiceMetricsViewRows(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewRows(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewRowsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewRowsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewRowsResponse> {
+  const queryOptions = getQueryServiceMetricsViewRowsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewTimeRange
+ */
+export function queryServiceMetricsViewTimeRange(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeRangeRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewTimeRangeResponse> {
+  return client.queryService.metricsViewTimeRange(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewTimeRangeQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewTimeRangeRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewTimeRange",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewTimeRangeQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeRangeRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewTimeRangeResponse>>;
+  },
+): CreateQueryOptions<MetricsViewTimeRangeResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewTimeRangeQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewTimeRangeResponse> = ({ signal }) =>
+    queryServiceMetricsViewTimeRange(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewTimeRange(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeRangeRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewTimeRangeResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewTimeRangeResponse> {
+  const queryOptions = getQueryServiceMetricsViewTimeRangeQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewSchema
+ */
+export function queryServiceMetricsViewSchema(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewSchemaRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewSchemaResponse> {
+  return client.queryService.metricsViewSchema(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewSchemaQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewSchemaRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewSchema",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewSchemaQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewSchemaRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewSchemaResponse>>;
+  },
+): CreateQueryOptions<MetricsViewSchemaResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewSchemaQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewSchemaResponse> = ({ signal }) =>
+    queryServiceMetricsViewSchema(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewSchema(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewSchemaRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewSchemaResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewSchemaResponse> {
+  const queryOptions = getQueryServiceMetricsViewSchemaQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewSearch
+ */
+export function queryServiceMetricsViewSearch(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewSearchRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewSearchResponse> {
+  return client.queryService.metricsViewSearch(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewSearchQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewSearchRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewSearch",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewSearchQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewSearchRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewSearchResponse>>;
+  },
+): CreateQueryOptions<MetricsViewSearchResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewSearchQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewSearchResponse> = ({ signal }) =>
+    queryServiceMetricsViewSearch(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewSearch(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewSearchRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewSearchResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewSearchResponse> {
+  const queryOptions = getQueryServiceMetricsViewSearchQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewTimeRanges
+ */
+export function queryServiceMetricsViewTimeRanges(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeRangesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewTimeRangesResponse> {
+  return client.queryService.metricsViewTimeRanges(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewTimeRangesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewTimeRangesRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewTimeRanges",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewTimeRangesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeRangesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewTimeRangesResponse>>;
+  },
+): CreateQueryOptions<MetricsViewTimeRangesResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewTimeRangesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewTimeRangesResponse> = ({ signal }) =>
+    queryServiceMetricsViewTimeRanges(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewTimeRanges(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewTimeRangesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewTimeRangesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewTimeRangesResponse> {
+  const queryOptions = getQueryServiceMetricsViewTimeRangesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.MetricsViewAnnotations
+ */
+export function queryServiceMetricsViewAnnotations(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewAnnotationsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<MetricsViewAnnotationsResponse> {
+  return client.queryService.metricsViewAnnotations(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceMetricsViewAnnotationsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<MetricsViewAnnotationsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "metricsViewAnnotations",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceMetricsViewAnnotationsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewAnnotationsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewAnnotationsResponse>>;
+  },
+): CreateQueryOptions<MetricsViewAnnotationsResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceMetricsViewAnnotationsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<MetricsViewAnnotationsResponse> = ({ signal }) =>
+    queryServiceMetricsViewAnnotations(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceMetricsViewAnnotations(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<MetricsViewAnnotationsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<MetricsViewAnnotationsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<MetricsViewAnnotationsResponse> {
+  const queryOptions = getQueryServiceMetricsViewAnnotationsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ConvertExpressionToMetricsSQL
+ */
+export function queryServiceConvertExpressionToMetricsSQL(
+  client: RuntimeClient,
+  request: PartialMessage<
+    Omit<ConvertExpressionToMetricsSQLRequest, "instanceId">
+  >,
+  options?: { signal?: AbortSignal },
+): Promise<ConvertExpressionToMetricsSQLResponse> {
+  return client.queryService.convertExpressionToMetricsSQL(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceConvertExpressionToMetricsSQLQueryKey(
+  instanceId: string,
+  request?: PartialMessage<
+    Omit<ConvertExpressionToMetricsSQLRequest, "instanceId">
+  >,
+): QueryKey {
+  return [
+    "QueryService",
+    "convertExpressionToMetricsSQL",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<
+    Omit<ConvertExpressionToMetricsSQLRequest, "instanceId">
+  >,
+  options?: {
+    query?: Partial<CreateQueryOptions<ConvertExpressionToMetricsSQLResponse>>;
+  },
+): CreateQueryOptions<ConvertExpressionToMetricsSQLResponse> & {
+  queryKey: QueryKey;
+} {
+  const queryKey = getQueryServiceConvertExpressionToMetricsSQLQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ConvertExpressionToMetricsSQLResponse> = ({
+    signal,
+  }) => queryServiceConvertExpressionToMetricsSQL(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceConvertExpressionToMetricsSQL(
+  client: RuntimeClient,
+  request: PartialMessage<
+    Omit<ConvertExpressionToMetricsSQLRequest, "instanceId">
+  >,
+  options?: {
+    query?: Partial<CreateQueryOptions<ConvertExpressionToMetricsSQLResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ConvertExpressionToMetricsSQLResponse> {
+  const queryOptions = getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ResolveCanvas
+ */
+export function queryServiceResolveCanvas(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveCanvasRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ResolveCanvasResponse> {
+  return client.queryService.resolveCanvas(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceResolveCanvasQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ResolveCanvasRequest, "instanceId">>,
+): QueryKey {
+  return ["QueryService", "resolveCanvas", instanceId, request ?? {}] as const;
+}
+
+export function getQueryServiceResolveCanvasQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveCanvasRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ResolveCanvasResponse>>;
+  },
+): CreateQueryOptions<ResolveCanvasResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceResolveCanvasQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ResolveCanvasResponse> = ({ signal }) =>
+    queryServiceResolveCanvas(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceResolveCanvas(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveCanvasRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ResolveCanvasResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ResolveCanvasResponse> {
+  const queryOptions = getQueryServiceResolveCanvasQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ResolveComponent
+ */
+export function queryServiceResolveComponent(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveComponentRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ResolveComponentResponse> {
+  return client.queryService.resolveComponent(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceResolveComponentQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ResolveComponentRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "resolveComponent",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceResolveComponentQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveComponentRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ResolveComponentResponse>>;
+  },
+): CreateQueryOptions<ResolveComponentResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceResolveComponentQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ResolveComponentResponse> = ({ signal }) =>
+    queryServiceResolveComponent(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceResolveComponent(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveComponentRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ResolveComponentResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ResolveComponentResponse> {
+  const queryOptions = getQueryServiceResolveComponentQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ResolveTemplatedString
+ */
+export function queryServiceResolveTemplatedString(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveTemplatedStringRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ResolveTemplatedStringResponse> {
+  return client.queryService.resolveTemplatedString(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceResolveTemplatedStringQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ResolveTemplatedStringRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "resolveTemplatedString",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceResolveTemplatedStringQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveTemplatedStringRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ResolveTemplatedStringResponse>>;
+  },
+): CreateQueryOptions<ResolveTemplatedStringResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceResolveTemplatedStringQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ResolveTemplatedStringResponse> = ({ signal }) =>
+    queryServiceResolveTemplatedString(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceResolveTemplatedString(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ResolveTemplatedStringRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ResolveTemplatedStringResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ResolveTemplatedStringResponse> {
+  const queryOptions = getQueryServiceResolveTemplatedStringQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnRollupInterval
+ */
+export function queryServiceColumnRollupInterval(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnRollupIntervalRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnRollupIntervalResponse> {
+  return client.queryService.columnRollupInterval(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnRollupIntervalQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnRollupIntervalRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnRollupInterval",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnRollupIntervalQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnRollupIntervalRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnRollupIntervalResponse>>;
+  },
+): CreateQueryOptions<ColumnRollupIntervalResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnRollupIntervalQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnRollupIntervalResponse> = ({ signal }) =>
+    queryServiceColumnRollupInterval(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnRollupInterval(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnRollupIntervalRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnRollupIntervalResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnRollupIntervalResponse> {
+  const queryOptions = getQueryServiceColumnRollupIntervalQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnTopK
+ */
+export function queryServiceColumnTopK(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTopKRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnTopKResponse> {
+  return client.queryService.columnTopK(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnTopKQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnTopKRequest, "instanceId">>,
+): QueryKey {
+  return ["QueryService", "columnTopK", instanceId, request ?? {}] as const;
+}
+
+export function getQueryServiceColumnTopKQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTopKRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnTopKResponse>>;
+  },
+): CreateQueryOptions<ColumnTopKResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnTopKQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnTopKResponse> = ({ signal }) =>
+    queryServiceColumnTopK(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnTopK(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTopKRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnTopKResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnTopKResponse> {
+  const queryOptions = getQueryServiceColumnTopKQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnNullCount
+ */
+export function queryServiceColumnNullCount(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnNullCountRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnNullCountResponse> {
+  return client.queryService.columnNullCount(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnNullCountQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnNullCountRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnNullCount",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnNullCountQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnNullCountRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnNullCountResponse>>;
+  },
+): CreateQueryOptions<ColumnNullCountResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnNullCountQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnNullCountResponse> = ({ signal }) =>
+    queryServiceColumnNullCount(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnNullCount(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnNullCountRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnNullCountResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnNullCountResponse> {
+  const queryOptions = getQueryServiceColumnNullCountQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnDescriptiveStatistics
+ */
+export function queryServiceColumnDescriptiveStatistics(
+  client: RuntimeClient,
+  request: PartialMessage<
+    Omit<ColumnDescriptiveStatisticsRequest, "instanceId">
+  >,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnDescriptiveStatisticsResponse> {
+  return client.queryService.columnDescriptiveStatistics(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnDescriptiveStatisticsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<
+    Omit<ColumnDescriptiveStatisticsRequest, "instanceId">
+  >,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnDescriptiveStatistics",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnDescriptiveStatisticsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<
+    Omit<ColumnDescriptiveStatisticsRequest, "instanceId">
+  >,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnDescriptiveStatisticsResponse>>;
+  },
+): CreateQueryOptions<ColumnDescriptiveStatisticsResponse> & {
+  queryKey: QueryKey;
+} {
+  const queryKey = getQueryServiceColumnDescriptiveStatisticsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnDescriptiveStatisticsResponse> = ({
+    signal,
+  }) => queryServiceColumnDescriptiveStatistics(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnDescriptiveStatistics(
+  client: RuntimeClient,
+  request: PartialMessage<
+    Omit<ColumnDescriptiveStatisticsRequest, "instanceId">
+  >,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnDescriptiveStatisticsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnDescriptiveStatisticsResponse> {
+  const queryOptions = getQueryServiceColumnDescriptiveStatisticsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnTimeGrain
+ */
+export function queryServiceColumnTimeGrain(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeGrainRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnTimeGrainResponse> {
+  return client.queryService.columnTimeGrain(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnTimeGrainQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnTimeGrainRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnTimeGrain",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnTimeGrainQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeGrainRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnTimeGrainResponse>>;
+  },
+): CreateQueryOptions<ColumnTimeGrainResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnTimeGrainQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnTimeGrainResponse> = ({ signal }) =>
+    queryServiceColumnTimeGrain(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnTimeGrain(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeGrainRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnTimeGrainResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnTimeGrainResponse> {
+  const queryOptions = getQueryServiceColumnTimeGrainQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnNumericHistogram
+ */
+export function queryServiceColumnNumericHistogram(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnNumericHistogramRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnNumericHistogramResponse> {
+  return client.queryService.columnNumericHistogram(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnNumericHistogramQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnNumericHistogramRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnNumericHistogram",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnNumericHistogramQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnNumericHistogramRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnNumericHistogramResponse>>;
+  },
+): CreateQueryOptions<ColumnNumericHistogramResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnNumericHistogramQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnNumericHistogramResponse> = ({ signal }) =>
+    queryServiceColumnNumericHistogram(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnNumericHistogram(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnNumericHistogramRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnNumericHistogramResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnNumericHistogramResponse> {
+  const queryOptions = getQueryServiceColumnNumericHistogramQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnRugHistogram
+ */
+export function queryServiceColumnRugHistogram(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnRugHistogramRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnRugHistogramResponse> {
+  return client.queryService.columnRugHistogram(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnRugHistogramQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnRugHistogramRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnRugHistogram",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnRugHistogramQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnRugHistogramRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnRugHistogramResponse>>;
+  },
+): CreateQueryOptions<ColumnRugHistogramResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnRugHistogramQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnRugHistogramResponse> = ({ signal }) =>
+    queryServiceColumnRugHistogram(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnRugHistogram(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnRugHistogramRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnRugHistogramResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnRugHistogramResponse> {
+  const queryOptions = getQueryServiceColumnRugHistogramQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnTimeRange
+ */
+export function queryServiceColumnTimeRange(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeRangeRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnTimeRangeResponse> {
+  return client.queryService.columnTimeRange(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnTimeRangeQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnTimeRangeRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnTimeRange",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnTimeRangeQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeRangeRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnTimeRangeResponse>>;
+  },
+): CreateQueryOptions<ColumnTimeRangeResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnTimeRangeQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnTimeRangeResponse> = ({ signal }) =>
+    queryServiceColumnTimeRange(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnTimeRange(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeRangeRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnTimeRangeResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnTimeRangeResponse> {
+  const queryOptions = getQueryServiceColumnTimeRangeQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnCardinality
+ */
+export function queryServiceColumnCardinality(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnCardinalityRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnCardinalityResponse> {
+  return client.queryService.columnCardinality(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnCardinalityQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnCardinalityRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnCardinality",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnCardinalityQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnCardinalityRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnCardinalityResponse>>;
+  },
+): CreateQueryOptions<ColumnCardinalityResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnCardinalityQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnCardinalityResponse> = ({ signal }) =>
+    queryServiceColumnCardinality(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnCardinality(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnCardinalityRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnCardinalityResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnCardinalityResponse> {
+  const queryOptions = getQueryServiceColumnCardinalityQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.ColumnTimeSeries
+ */
+export function queryServiceColumnTimeSeries(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeSeriesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ColumnTimeSeriesResponse> {
+  return client.queryService.columnTimeSeries(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceColumnTimeSeriesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ColumnTimeSeriesRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "columnTimeSeries",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceColumnTimeSeriesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeSeriesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnTimeSeriesResponse>>;
+  },
+): CreateQueryOptions<ColumnTimeSeriesResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceColumnTimeSeriesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ColumnTimeSeriesResponse> = ({ signal }) =>
+    queryServiceColumnTimeSeries(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceColumnTimeSeries(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ColumnTimeSeriesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ColumnTimeSeriesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ColumnTimeSeriesResponse> {
+  const queryOptions = getQueryServiceColumnTimeSeriesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.TableCardinality
+ */
+export function queryServiceTableCardinality(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableCardinalityRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<TableCardinalityResponse> {
+  return client.queryService.tableCardinality(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceTableCardinalityQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<TableCardinalityRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "QueryService",
+    "tableCardinality",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getQueryServiceTableCardinalityQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableCardinalityRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<TableCardinalityResponse>>;
+  },
+): CreateQueryOptions<TableCardinalityResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceTableCardinalityQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<TableCardinalityResponse> = ({ signal }) =>
+    queryServiceTableCardinality(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceTableCardinality(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableCardinalityRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<TableCardinalityResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<TableCardinalityResponse> {
+  const queryOptions = getQueryServiceTableCardinalityQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.TableColumns
+ */
+export function queryServiceTableColumns(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableColumnsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<TableColumnsResponse> {
+  return client.queryService.tableColumns(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceTableColumnsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<TableColumnsRequest, "instanceId">>,
+): QueryKey {
+  return ["QueryService", "tableColumns", instanceId, request ?? {}] as const;
+}
+
+export function getQueryServiceTableColumnsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableColumnsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<TableColumnsResponse>>;
+  },
+): CreateQueryOptions<TableColumnsResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceTableColumnsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<TableColumnsResponse> = ({ signal }) =>
+    queryServiceTableColumns(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceTableColumns(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableColumnsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<TableColumnsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<TableColumnsResponse> {
+  const queryOptions = getQueryServiceTableColumnsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: QueryService.TableRows
+ */
+export function queryServiceTableRows(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableRowsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<TableRowsResponse> {
+  return client.queryService.tableRows(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getQueryServiceTableRowsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<TableRowsRequest, "instanceId">>,
+): QueryKey {
+  return ["QueryService", "tableRows", instanceId, request ?? {}] as const;
+}
+
+export function getQueryServiceTableRowsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableRowsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<TableRowsResponse>>;
+  },
+): CreateQueryOptions<TableRowsResponse> & { queryKey: QueryKey } {
+  const queryKey = getQueryServiceTableRowsQueryKey(client.instanceId, request);
+  const queryFn: QueryFunction<TableRowsResponse> = ({ signal }) =>
+    queryServiceTableRows(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createQueryServiceTableRows(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<TableRowsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<TableRowsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<TableRowsResponse> {
+  const queryOptions = getQueryServiceTableRowsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): QueryService.Query
+ */
+export function queryServiceQuery(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<QueryRequest, "instanceId">>,
+): Promise<QueryResponse> {
+  return client.queryService.query({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getQueryServiceQueryMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      QueryResponse,
+      unknown,
+      PartialMessage<Omit<QueryRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  QueryResponse,
+  unknown,
+  PartialMessage<Omit<QueryRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => queryServiceQuery(client, request),
+    ...options,
+  };
+}
+
+export function createQueryServiceQueryMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      QueryResponse,
+      unknown,
+      PartialMessage<Omit<QueryRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  QueryResponse,
+  unknown,
+  PartialMessage<Omit<QueryRequest, "instanceId">>
+> {
+  const mutationOptions = getQueryServiceQueryMutationOptions(client, options);
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): QueryService.Export
+ */
+export function queryServiceExport(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ExportRequest, "instanceId">>,
+): Promise<ExportResponse> {
+  return client.queryService.export({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getQueryServiceExportMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ExportResponse,
+      unknown,
+      PartialMessage<Omit<ExportRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  ExportResponse,
+  unknown,
+  PartialMessage<Omit<ExportRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => queryServiceExport(client, request),
+    ...options,
+  };
+}
+
+export function createQueryServiceExportMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ExportResponse,
+      unknown,
+      PartialMessage<Omit<ExportRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  ExportResponse,
+  unknown,
+  PartialMessage<Omit<ExportRequest, "instanceId">>
+> {
+  const mutationOptions = getQueryServiceExportMutationOptions(client, options);
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): QueryService.ExportReport
+ */
+export function queryServiceExportReport(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ExportReportRequest, "instanceId">>,
+): Promise<ExportReportResponse> {
+  return client.queryService.exportReport({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getQueryServiceExportReportMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ExportReportResponse,
+      unknown,
+      PartialMessage<Omit<ExportReportRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  ExportReportResponse,
+  unknown,
+  PartialMessage<Omit<ExportReportRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => queryServiceExportReport(client, request),
+    ...options,
+  };
+}
+
+export function createQueryServiceExportReportMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ExportReportResponse,
+      unknown,
+      PartialMessage<Omit<ExportReportRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  ExportReportResponse,
+  unknown,
+  PartialMessage<Omit<ExportReportRequest, "instanceId">>
+> {
+  const mutationOptions = getQueryServiceExportReportMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
diff --git a/web-common/src/runtime-client/v2/gen/runtime-service.ts b/web-common/src/runtime-client/v2/gen/runtime-service.ts
new file mode 100644
index 00000000000..23e1b3db961
--- /dev/null
+++ b/web-common/src/runtime-client/v2/gen/runtime-service.ts
@@ -0,0 +1,2934 @@
+// Generated by generate-query-hooks.ts — DO NOT EDIT
+
+import type { RuntimeClient } from "../runtime-client";
+import type { PartialMessage } from "@bufbuild/protobuf";
+import {
+  createQuery,
+  createMutation,
+  type CreateQueryOptions,
+  type CreateQueryResult,
+  type QueryClient,
+  type QueryFunction,
+  type QueryKey,
+  type CreateMutationOptions,
+  type CreateMutationResult,
+} from "@tanstack/svelte-query";
+import {
+  AnalyzeConnectorsRequest,
+  AnalyzeConnectorsResponse,
+  AnalyzeVariablesRequest,
+  AnalyzeVariablesResponse,
+  CompleteRequest,
+  CompleteResponse,
+  CreateDirectoryRequest,
+  CreateDirectoryResponse,
+  CreateInstanceRequest,
+  CreateInstanceResponse,
+  CreateTriggerRequest,
+  CreateTriggerResponse,
+  DeleteFileRequest,
+  DeleteFileResponse,
+  DeleteInstanceRequest,
+  DeleteInstanceResponse,
+  EditInstanceRequest,
+  EditInstanceResponse,
+  ForkConversationRequest,
+  ForkConversationResponse,
+  GenerateCanvasFileRequest,
+  GenerateCanvasFileResponse,
+  GenerateMetricsViewFileRequest,
+  GenerateMetricsViewFileResponse,
+  GenerateRendererRequest,
+  GenerateRendererResponse,
+  GenerateResolverRequest,
+  GenerateResolverResponse,
+  GetConversationRequest,
+  GetConversationResponse,
+  GetExploreRequest,
+  GetExploreResponse,
+  GetFileRequest,
+  GetFileResponse,
+  GetInstanceRequest,
+  GetInstanceResponse,
+  GetLogsRequest,
+  GetLogsResponse,
+  GetModelPartitionsRequest,
+  GetModelPartitionsResponse,
+  GetResourceRequest,
+  GetResourceResponse,
+  GitCommitRequest,
+  GitCommitResponse,
+  GitMergeToBranchRequest,
+  GitMergeToBranchResponse,
+  GitPullRequest,
+  GitPullResponse,
+  GitPushRequest,
+  GitPushResponse,
+  GitStatusRequest,
+  GitStatusResponse,
+  GitSwitchBranchRequest,
+  GitSwitchBranchResponse,
+  HealthRequest,
+  HealthResponse,
+  InstanceHealthRequest,
+  InstanceHealthResponse,
+  IssueDevJWTRequest,
+  IssueDevJWTResponse,
+  ListConnectorDriversRequest,
+  ListConnectorDriversResponse,
+  ListConversationsRequest,
+  ListConversationsResponse,
+  ListExamplesRequest,
+  ListExamplesResponse,
+  ListFilesRequest,
+  ListFilesResponse,
+  ListGitBranchesRequest,
+  ListGitBranchesResponse,
+  ListGitCommitsRequest,
+  ListGitCommitsResponse,
+  ListInstancesRequest,
+  ListInstancesResponse,
+  ListNotifierConnectorsRequest,
+  ListNotifierConnectorsResponse,
+  ListResourcesRequest,
+  ListResourcesResponse,
+  ListToolsRequest,
+  ListToolsResponse,
+  PingRequest,
+  PingResponse,
+  PutFileRequest,
+  PutFileResponse,
+  QueryResolverRequest,
+  QueryResolverResponse,
+  ReloadConfigRequest,
+  ReloadConfigResponse,
+  RenameFileRequest,
+  RenameFileResponse,
+  RestoreGitCommitRequest,
+  RestoreGitCommitResponse,
+  ShareConversationRequest,
+  ShareConversationResponse,
+  UnpackEmptyRequest,
+  UnpackEmptyResponse,
+  UnpackExampleRequest,
+  UnpackExampleResponse,
+} from "../../../proto/gen/rill/runtime/v1/api_pb";
+
+/**
+ * Raw RPC call: RuntimeService.Ping
+ */
+export function runtimeServicePing(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<PingRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<PingResponse> {
+  return client.runtimeService.ping(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServicePingQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<PingRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "ping", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServicePingQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<PingRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<PingResponse>>;
+  },
+): CreateQueryOptions<PingResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServicePingQueryKey(client.instanceId, request);
+  const queryFn: QueryFunction<PingResponse> = ({ signal }) =>
+    runtimeServicePing(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServicePing(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<PingRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<PingResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<PingResponse> {
+  const queryOptions = getRuntimeServicePingQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.Health
+ */
+export function runtimeServiceHealth(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<HealthRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<HealthResponse> {
+  return client.runtimeService.health(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceHealthQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<HealthRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "health", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceHealthQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<HealthRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<HealthResponse>>;
+  },
+): CreateQueryOptions<HealthResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceHealthQueryKey(client.instanceId, request);
+  const queryFn: QueryFunction<HealthResponse> = ({ signal }) =>
+    runtimeServiceHealth(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceHealth(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<HealthRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<HealthResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<HealthResponse> {
+  const queryOptions = getRuntimeServiceHealthQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.InstanceHealth
+ */
+export function runtimeServiceInstanceHealth(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<InstanceHealthRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<InstanceHealthResponse> {
+  return client.runtimeService.instanceHealth(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceInstanceHealthQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<InstanceHealthRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "instanceHealth",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceInstanceHealthQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<InstanceHealthRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<InstanceHealthResponse>>;
+  },
+): CreateQueryOptions<InstanceHealthResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceInstanceHealthQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<InstanceHealthResponse> = ({ signal }) =>
+    runtimeServiceInstanceHealth(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceInstanceHealth(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<InstanceHealthRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<InstanceHealthResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<InstanceHealthResponse> {
+  const queryOptions = getRuntimeServiceInstanceHealthQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListInstances
+ */
+export function runtimeServiceListInstances(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListInstancesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListInstancesResponse> {
+  return client.runtimeService.listInstances(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListInstancesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListInstancesRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "listInstances",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceListInstancesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListInstancesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListInstancesResponse>>;
+  },
+): CreateQueryOptions<ListInstancesResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListInstancesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListInstancesResponse> = ({ signal }) =>
+    runtimeServiceListInstances(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListInstances(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListInstancesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListInstancesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListInstancesResponse> {
+  const queryOptions = getRuntimeServiceListInstancesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.GetInstance
+ */
+export function runtimeServiceGetInstance(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetInstanceRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<GetInstanceResponse> {
+  return client.runtimeService.getInstance(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceGetInstanceQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<GetInstanceRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "getInstance", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceGetInstanceQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetInstanceRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetInstanceResponse>>;
+  },
+): CreateQueryOptions<GetInstanceResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceGetInstanceQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<GetInstanceResponse> = ({ signal }) =>
+    runtimeServiceGetInstance(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceGetInstance(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetInstanceRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetInstanceResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<GetInstanceResponse> {
+  const queryOptions = getRuntimeServiceGetInstanceQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListFiles
+ */
+export function runtimeServiceListFiles(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListFilesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListFilesResponse> {
+  return client.runtimeService.listFiles(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListFilesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListFilesRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "listFiles", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceListFilesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListFilesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListFilesResponse>>;
+  },
+): CreateQueryOptions<ListFilesResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListFilesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListFilesResponse> = ({ signal }) =>
+    runtimeServiceListFiles(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListFiles(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListFilesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListFilesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListFilesResponse> {
+  const queryOptions = getRuntimeServiceListFilesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.GetFile
+ */
+export function runtimeServiceGetFile(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetFileRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<GetFileResponse> {
+  return client.runtimeService.getFile(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceGetFileQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<GetFileRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "getFile", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceGetFileQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetFileRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetFileResponse>>;
+  },
+): CreateQueryOptions<GetFileResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceGetFileQueryKey(client.instanceId, request);
+  const queryFn: QueryFunction<GetFileResponse> = ({ signal }) =>
+    runtimeServiceGetFile(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceGetFile(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetFileRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetFileResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<GetFileResponse> {
+  const queryOptions = getRuntimeServiceGetFileQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListExamples
+ */
+export function runtimeServiceListExamples(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListExamplesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListExamplesResponse> {
+  return client.runtimeService.listExamples(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListExamplesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListExamplesRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "listExamples", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceListExamplesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListExamplesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListExamplesResponse>>;
+  },
+): CreateQueryOptions<ListExamplesResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListExamplesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListExamplesResponse> = ({ signal }) =>
+    runtimeServiceListExamples(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListExamples(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListExamplesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListExamplesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListExamplesResponse> {
+  const queryOptions = getRuntimeServiceListExamplesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.QueryResolver
+ */
+export function runtimeServiceQueryResolver(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<QueryResolverRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<QueryResolverResponse> {
+  return client.runtimeService.queryResolver(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceQueryResolverQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<QueryResolverRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "queryResolver",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceQueryResolverQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<QueryResolverRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<QueryResolverResponse>>;
+  },
+): CreateQueryOptions<QueryResolverResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceQueryResolverQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<QueryResolverResponse> = ({ signal }) =>
+    runtimeServiceQueryResolver(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceQueryResolver(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<QueryResolverRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<QueryResolverResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<QueryResolverResponse> {
+  const queryOptions = getRuntimeServiceQueryResolverQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.GetLogs
+ */
+export function runtimeServiceGetLogs(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetLogsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<GetLogsResponse> {
+  return client.runtimeService.getLogs(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceGetLogsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<GetLogsRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "getLogs", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceGetLogsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetLogsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetLogsResponse>>;
+  },
+): CreateQueryOptions<GetLogsResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceGetLogsQueryKey(client.instanceId, request);
+  const queryFn: QueryFunction<GetLogsResponse> = ({ signal }) =>
+    runtimeServiceGetLogs(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceGetLogs(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetLogsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetLogsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<GetLogsResponse> {
+  const queryOptions = getRuntimeServiceGetLogsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListResources
+ */
+export function runtimeServiceListResources(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListResourcesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListResourcesResponse> {
+  return client.runtimeService.listResources(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListResourcesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListResourcesRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "listResources",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceListResourcesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListResourcesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListResourcesResponse>>;
+  },
+): CreateQueryOptions<ListResourcesResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListResourcesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListResourcesResponse> = ({ signal }) =>
+    runtimeServiceListResources(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListResources(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListResourcesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListResourcesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListResourcesResponse> {
+  const queryOptions = getRuntimeServiceListResourcesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.GetResource
+ */
+export function runtimeServiceGetResource(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetResourceRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<GetResourceResponse> {
+  return client.runtimeService.getResource(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceGetResourceQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<GetResourceRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "getResource", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceGetResourceQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetResourceRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetResourceResponse>>;
+  },
+): CreateQueryOptions<GetResourceResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceGetResourceQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<GetResourceResponse> = ({ signal }) =>
+    runtimeServiceGetResource(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceGetResource(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetResourceRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetResourceResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<GetResourceResponse> {
+  const queryOptions = getRuntimeServiceGetResourceQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.GetExplore
+ */
+export function runtimeServiceGetExplore(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetExploreRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<GetExploreResponse> {
+  return client.runtimeService.getExplore(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceGetExploreQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<GetExploreRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "getExplore", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceGetExploreQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetExploreRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetExploreResponse>>;
+  },
+): CreateQueryOptions<GetExploreResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceGetExploreQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<GetExploreResponse> = ({ signal }) =>
+    runtimeServiceGetExplore(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceGetExplore(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetExploreRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetExploreResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<GetExploreResponse> {
+  const queryOptions = getRuntimeServiceGetExploreQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.GetModelPartitions
+ */
+export function runtimeServiceGetModelPartitions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetModelPartitionsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<GetModelPartitionsResponse> {
+  return client.runtimeService.getModelPartitions(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceGetModelPartitionsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<GetModelPartitionsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "getModelPartitions",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceGetModelPartitionsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetModelPartitionsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetModelPartitionsResponse>>;
+  },
+): CreateQueryOptions<GetModelPartitionsResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceGetModelPartitionsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<GetModelPartitionsResponse> = ({ signal }) =>
+    runtimeServiceGetModelPartitions(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceGetModelPartitions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetModelPartitionsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetModelPartitionsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<GetModelPartitionsResponse> {
+  const queryOptions = getRuntimeServiceGetModelPartitionsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListConnectorDrivers
+ */
+export function runtimeServiceListConnectorDrivers(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListConnectorDriversRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListConnectorDriversResponse> {
+  return client.runtimeService.listConnectorDrivers(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListConnectorDriversQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListConnectorDriversRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "listConnectorDrivers",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceListConnectorDriversQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListConnectorDriversRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListConnectorDriversResponse>>;
+  },
+): CreateQueryOptions<ListConnectorDriversResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListConnectorDriversQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListConnectorDriversResponse> = ({ signal }) =>
+    runtimeServiceListConnectorDrivers(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListConnectorDrivers(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListConnectorDriversRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListConnectorDriversResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListConnectorDriversResponse> {
+  const queryOptions = getRuntimeServiceListConnectorDriversQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.AnalyzeConnectors
+ */
+export function runtimeServiceAnalyzeConnectors(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<AnalyzeConnectorsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<AnalyzeConnectorsResponse> {
+  return client.runtimeService.analyzeConnectors(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceAnalyzeConnectorsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<AnalyzeConnectorsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "analyzeConnectors",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceAnalyzeConnectorsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<AnalyzeConnectorsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<AnalyzeConnectorsResponse>>;
+  },
+): CreateQueryOptions<AnalyzeConnectorsResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceAnalyzeConnectorsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<AnalyzeConnectorsResponse> = ({ signal }) =>
+    runtimeServiceAnalyzeConnectors(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceAnalyzeConnectors(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<AnalyzeConnectorsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<AnalyzeConnectorsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<AnalyzeConnectorsResponse> {
+  const queryOptions = getRuntimeServiceAnalyzeConnectorsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListNotifierConnectors
+ */
+export function runtimeServiceListNotifierConnectors(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListNotifierConnectorsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListNotifierConnectorsResponse> {
+  return client.runtimeService.listNotifierConnectors(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListNotifierConnectorsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListNotifierConnectorsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "listNotifierConnectors",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceListNotifierConnectorsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListNotifierConnectorsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListNotifierConnectorsResponse>>;
+  },
+): CreateQueryOptions<ListNotifierConnectorsResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListNotifierConnectorsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListNotifierConnectorsResponse> = ({ signal }) =>
+    runtimeServiceListNotifierConnectors(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListNotifierConnectors(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListNotifierConnectorsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListNotifierConnectorsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListNotifierConnectorsResponse> {
+  const queryOptions = getRuntimeServiceListNotifierConnectorsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListConversations
+ */
+export function runtimeServiceListConversations(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListConversationsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListConversationsResponse> {
+  return client.runtimeService.listConversations(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListConversationsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListConversationsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "listConversations",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceListConversationsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListConversationsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListConversationsResponse>>;
+  },
+): CreateQueryOptions<ListConversationsResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListConversationsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListConversationsResponse> = ({ signal }) =>
+    runtimeServiceListConversations(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListConversations(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListConversationsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListConversationsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListConversationsResponse> {
+  const queryOptions = getRuntimeServiceListConversationsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.GetConversation
+ */
+export function runtimeServiceGetConversation(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetConversationRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<GetConversationResponse> {
+  return client.runtimeService.getConversation(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceGetConversationQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<GetConversationRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "getConversation",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceGetConversationQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetConversationRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetConversationResponse>>;
+  },
+): CreateQueryOptions<GetConversationResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceGetConversationQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<GetConversationResponse> = ({ signal }) =>
+    runtimeServiceGetConversation(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceGetConversation(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GetConversationRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<GetConversationResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<GetConversationResponse> {
+  const queryOptions = getRuntimeServiceGetConversationQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListTools
+ */
+export function runtimeServiceListTools(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListToolsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListToolsResponse> {
+  return client.runtimeService.listTools(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListToolsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListToolsRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "listTools", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceListToolsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListToolsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListToolsResponse>>;
+  },
+): CreateQueryOptions<ListToolsResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListToolsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListToolsResponse> = ({ signal }) =>
+    runtimeServiceListTools(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListTools(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListToolsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListToolsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListToolsResponse> {
+  const queryOptions = getRuntimeServiceListToolsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.IssueDevJWT
+ */
+export function runtimeServiceIssueDevJWT(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<IssueDevJWTRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<IssueDevJWTResponse> {
+  return client.runtimeService.issueDevJWT(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceIssueDevJWTQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<IssueDevJWTRequest, "instanceId">>,
+): QueryKey {
+  return ["RuntimeService", "issueDevJWT", instanceId, request ?? {}] as const;
+}
+
+export function getRuntimeServiceIssueDevJWTQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<IssueDevJWTRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<IssueDevJWTResponse>>;
+  },
+): CreateQueryOptions<IssueDevJWTResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceIssueDevJWTQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<IssueDevJWTResponse> = ({ signal }) =>
+    runtimeServiceIssueDevJWT(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceIssueDevJWT(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<IssueDevJWTRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<IssueDevJWTResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<IssueDevJWTResponse> {
+  const queryOptions = getRuntimeServiceIssueDevJWTQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.AnalyzeVariables
+ */
+export function runtimeServiceAnalyzeVariables(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<AnalyzeVariablesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<AnalyzeVariablesResponse> {
+  return client.runtimeService.analyzeVariables(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceAnalyzeVariablesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<AnalyzeVariablesRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "analyzeVariables",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceAnalyzeVariablesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<AnalyzeVariablesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<AnalyzeVariablesResponse>>;
+  },
+): CreateQueryOptions<AnalyzeVariablesResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceAnalyzeVariablesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<AnalyzeVariablesResponse> = ({ signal }) =>
+    runtimeServiceAnalyzeVariables(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceAnalyzeVariables(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<AnalyzeVariablesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<AnalyzeVariablesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<AnalyzeVariablesResponse> {
+  const queryOptions = getRuntimeServiceAnalyzeVariablesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListGitCommits
+ */
+export function runtimeServiceListGitCommits(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListGitCommitsRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListGitCommitsResponse> {
+  return client.runtimeService.listGitCommits(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListGitCommitsQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListGitCommitsRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "listGitCommits",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceListGitCommitsQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListGitCommitsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListGitCommitsResponse>>;
+  },
+): CreateQueryOptions<ListGitCommitsResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListGitCommitsQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListGitCommitsResponse> = ({ signal }) =>
+    runtimeServiceListGitCommits(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListGitCommits(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListGitCommitsRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListGitCommitsResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListGitCommitsResponse> {
+  const queryOptions = getRuntimeServiceListGitCommitsQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call: RuntimeService.ListGitBranches
+ */
+export function runtimeServiceListGitBranches(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListGitBranchesRequest, "instanceId">>,
+  options?: { signal?: AbortSignal },
+): Promise<ListGitBranchesResponse> {
+  return client.runtimeService.listGitBranches(
+    { instanceId: client.instanceId, ...request },
+    { signal: options?.signal },
+  );
+}
+
+export function getRuntimeServiceListGitBranchesQueryKey(
+  instanceId: string,
+  request?: PartialMessage<Omit<ListGitBranchesRequest, "instanceId">>,
+): QueryKey {
+  return [
+    "RuntimeService",
+    "listGitBranches",
+    instanceId,
+    request ?? {},
+  ] as const;
+}
+
+export function getRuntimeServiceListGitBranchesQueryOptions(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListGitBranchesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListGitBranchesResponse>>;
+  },
+): CreateQueryOptions<ListGitBranchesResponse> & { queryKey: QueryKey } {
+  const queryKey = getRuntimeServiceListGitBranchesQueryKey(
+    client.instanceId,
+    request,
+  );
+  const queryFn: QueryFunction<ListGitBranchesResponse> = ({ signal }) =>
+    runtimeServiceListGitBranches(client, request, { signal });
+  return {
+    queryKey,
+    queryFn,
+    enabled: !!client.instanceId,
+    ...options?.query,
+  };
+}
+
+export function createRuntimeServiceListGitBranches(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ListGitBranchesRequest, "instanceId">>,
+  options?: {
+    query?: Partial<CreateQueryOptions<ListGitBranchesResponse>>;
+  },
+  queryClient?: QueryClient,
+): CreateQueryResult<ListGitBranchesResponse> {
+  const queryOptions = getRuntimeServiceListGitBranchesQueryOptions(
+    client,
+    request,
+    options,
+  );
+  return createQuery(queryOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.CreateInstance
+ */
+export function runtimeServiceCreateInstance(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<CreateInstanceRequest, "instanceId">>,
+): Promise<CreateInstanceResponse> {
+  return client.runtimeService.createInstance({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceCreateInstanceMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      CreateInstanceResponse,
+      unknown,
+      PartialMessage<Omit<CreateInstanceRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  CreateInstanceResponse,
+  unknown,
+  PartialMessage<Omit<CreateInstanceRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceCreateInstance(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceCreateInstanceMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      CreateInstanceResponse,
+      unknown,
+      PartialMessage<Omit<CreateInstanceRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  CreateInstanceResponse,
+  unknown,
+  PartialMessage<Omit<CreateInstanceRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceCreateInstanceMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.EditInstance
+ */
+export function runtimeServiceEditInstance(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<EditInstanceRequest, "instanceId">>,
+): Promise<EditInstanceResponse> {
+  return client.runtimeService.editInstance({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceEditInstanceMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      EditInstanceResponse,
+      unknown,
+      PartialMessage<Omit<EditInstanceRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  EditInstanceResponse,
+  unknown,
+  PartialMessage<Omit<EditInstanceRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceEditInstance(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceEditInstanceMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      EditInstanceResponse,
+      unknown,
+      PartialMessage<Omit<EditInstanceRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  EditInstanceResponse,
+  unknown,
+  PartialMessage<Omit<EditInstanceRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceEditInstanceMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.DeleteInstance
+ */
+export function runtimeServiceDeleteInstance(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>,
+): Promise<DeleteInstanceResponse> {
+  return client.runtimeService.deleteInstance({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceDeleteInstanceMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      DeleteInstanceResponse,
+      unknown,
+      PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  DeleteInstanceResponse,
+  unknown,
+  PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceDeleteInstance(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceDeleteInstanceMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      DeleteInstanceResponse,
+      unknown,
+      PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  DeleteInstanceResponse,
+  unknown,
+  PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceDeleteInstanceMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.ReloadConfig
+ */
+export function runtimeServiceReloadConfig(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ReloadConfigRequest, "instanceId">>,
+): Promise<ReloadConfigResponse> {
+  return client.runtimeService.reloadConfig({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceReloadConfigMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ReloadConfigResponse,
+      unknown,
+      PartialMessage<Omit<ReloadConfigRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  ReloadConfigResponse,
+  unknown,
+  PartialMessage<Omit<ReloadConfigRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceReloadConfig(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceReloadConfigMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ReloadConfigResponse,
+      unknown,
+      PartialMessage<Omit<ReloadConfigRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  ReloadConfigResponse,
+  unknown,
+  PartialMessage<Omit<ReloadConfigRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceReloadConfigMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.PutFile
+ */
+export function runtimeServicePutFile(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<PutFileRequest, "instanceId">>,
+): Promise<PutFileResponse> {
+  return client.runtimeService.putFile({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServicePutFileMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      PutFileResponse,
+      unknown,
+      PartialMessage<Omit<PutFileRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  PutFileResponse,
+  unknown,
+  PartialMessage<Omit<PutFileRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServicePutFile(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServicePutFileMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      PutFileResponse,
+      unknown,
+      PartialMessage<Omit<PutFileRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  PutFileResponse,
+  unknown,
+  PartialMessage<Omit<PutFileRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServicePutFileMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.CreateDirectory
+ */
+export function runtimeServiceCreateDirectory(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>,
+): Promise<CreateDirectoryResponse> {
+  return client.runtimeService.createDirectory({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceCreateDirectoryMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      CreateDirectoryResponse,
+      unknown,
+      PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  CreateDirectoryResponse,
+  unknown,
+  PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceCreateDirectory(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceCreateDirectoryMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      CreateDirectoryResponse,
+      unknown,
+      PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  CreateDirectoryResponse,
+  unknown,
+  PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceCreateDirectoryMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.DeleteFile
+ */
+export function runtimeServiceDeleteFile(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<DeleteFileRequest, "instanceId">>,
+): Promise<DeleteFileResponse> {
+  return client.runtimeService.deleteFile({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceDeleteFileMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      DeleteFileResponse,
+      unknown,
+      PartialMessage<Omit<DeleteFileRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  DeleteFileResponse,
+  unknown,
+  PartialMessage<Omit<DeleteFileRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceDeleteFile(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceDeleteFileMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      DeleteFileResponse,
+      unknown,
+      PartialMessage<Omit<DeleteFileRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  DeleteFileResponse,
+  unknown,
+  PartialMessage<Omit<DeleteFileRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceDeleteFileMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.RenameFile
+ */
+export function runtimeServiceRenameFile(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<RenameFileRequest, "instanceId">>,
+): Promise<RenameFileResponse> {
+  return client.runtimeService.renameFile({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceRenameFileMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      RenameFileResponse,
+      unknown,
+      PartialMessage<Omit<RenameFileRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  RenameFileResponse,
+  unknown,
+  PartialMessage<Omit<RenameFileRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceRenameFile(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceRenameFileMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      RenameFileResponse,
+      unknown,
+      PartialMessage<Omit<RenameFileRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  RenameFileResponse,
+  unknown,
+  PartialMessage<Omit<RenameFileRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceRenameFileMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.UnpackExample
+ */
+export function runtimeServiceUnpackExample(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<UnpackExampleRequest, "instanceId">>,
+): Promise<UnpackExampleResponse> {
+  return client.runtimeService.unpackExample({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceUnpackExampleMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      UnpackExampleResponse,
+      unknown,
+      PartialMessage<Omit<UnpackExampleRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  UnpackExampleResponse,
+  unknown,
+  PartialMessage<Omit<UnpackExampleRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceUnpackExample(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceUnpackExampleMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      UnpackExampleResponse,
+      unknown,
+      PartialMessage<Omit<UnpackExampleRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  UnpackExampleResponse,
+  unknown,
+  PartialMessage<Omit<UnpackExampleRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceUnpackExampleMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.UnpackEmpty
+ */
+export function runtimeServiceUnpackEmpty(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>,
+): Promise<UnpackEmptyResponse> {
+  return client.runtimeService.unpackEmpty({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceUnpackEmptyMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      UnpackEmptyResponse,
+      unknown,
+      PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  UnpackEmptyResponse,
+  unknown,
+  PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceUnpackEmpty(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceUnpackEmptyMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      UnpackEmptyResponse,
+      unknown,
+      PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  UnpackEmptyResponse,
+  unknown,
+  PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceUnpackEmptyMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GenerateMetricsViewFile
+ */
+export function runtimeServiceGenerateMetricsViewFile(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>,
+): Promise<GenerateMetricsViewFileResponse> {
+  return client.runtimeService.generateMetricsViewFile({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGenerateMetricsViewFileMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GenerateMetricsViewFileResponse,
+      unknown,
+      PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GenerateMetricsViewFileResponse,
+  unknown,
+  PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) =>
+      runtimeServiceGenerateMetricsViewFile(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGenerateMetricsViewFileMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GenerateMetricsViewFileResponse,
+      unknown,
+      PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GenerateMetricsViewFileResponse,
+  unknown,
+  PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>
+> {
+  const mutationOptions =
+    getRuntimeServiceGenerateMetricsViewFileMutationOptions(client, options);
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GenerateCanvasFile
+ */
+export function runtimeServiceGenerateCanvasFile(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>,
+): Promise<GenerateCanvasFileResponse> {
+  return client.runtimeService.generateCanvasFile({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGenerateCanvasFileMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GenerateCanvasFileResponse,
+      unknown,
+      PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GenerateCanvasFileResponse,
+  unknown,
+  PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGenerateCanvasFile(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGenerateCanvasFileMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GenerateCanvasFileResponse,
+      unknown,
+      PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GenerateCanvasFileResponse,
+  unknown,
+  PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGenerateCanvasFileMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GenerateResolver
+ */
+export function runtimeServiceGenerateResolver(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GenerateResolverRequest, "instanceId">>,
+): Promise<GenerateResolverResponse> {
+  return client.runtimeService.generateResolver({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGenerateResolverMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GenerateResolverResponse,
+      unknown,
+      PartialMessage<Omit<GenerateResolverRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GenerateResolverResponse,
+  unknown,
+  PartialMessage<Omit<GenerateResolverRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGenerateResolver(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGenerateResolverMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GenerateResolverResponse,
+      unknown,
+      PartialMessage<Omit<GenerateResolverRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GenerateResolverResponse,
+  unknown,
+  PartialMessage<Omit<GenerateResolverRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGenerateResolverMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GenerateRenderer
+ */
+export function runtimeServiceGenerateRenderer(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GenerateRendererRequest, "instanceId">>,
+): Promise<GenerateRendererResponse> {
+  return client.runtimeService.generateRenderer({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGenerateRendererMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GenerateRendererResponse,
+      unknown,
+      PartialMessage<Omit<GenerateRendererRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GenerateRendererResponse,
+  unknown,
+  PartialMessage<Omit<GenerateRendererRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGenerateRenderer(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGenerateRendererMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GenerateRendererResponse,
+      unknown,
+      PartialMessage<Omit<GenerateRendererRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GenerateRendererResponse,
+  unknown,
+  PartialMessage<Omit<GenerateRendererRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGenerateRendererMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.CreateTrigger
+ */
+export function runtimeServiceCreateTrigger(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<CreateTriggerRequest, "instanceId">>,
+): Promise<CreateTriggerResponse> {
+  return client.runtimeService.createTrigger({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceCreateTriggerMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      CreateTriggerResponse,
+      unknown,
+      PartialMessage<Omit<CreateTriggerRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  CreateTriggerResponse,
+  unknown,
+  PartialMessage<Omit<CreateTriggerRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceCreateTrigger(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceCreateTriggerMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      CreateTriggerResponse,
+      unknown,
+      PartialMessage<Omit<CreateTriggerRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  CreateTriggerResponse,
+  unknown,
+  PartialMessage<Omit<CreateTriggerRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceCreateTriggerMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.ShareConversation
+ */
+export function runtimeServiceShareConversation(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ShareConversationRequest, "instanceId">>,
+): Promise<ShareConversationResponse> {
+  return client.runtimeService.shareConversation({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceShareConversationMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ShareConversationResponse,
+      unknown,
+      PartialMessage<Omit<ShareConversationRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  ShareConversationResponse,
+  unknown,
+  PartialMessage<Omit<ShareConversationRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceShareConversation(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceShareConversationMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ShareConversationResponse,
+      unknown,
+      PartialMessage<Omit<ShareConversationRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  ShareConversationResponse,
+  unknown,
+  PartialMessage<Omit<ShareConversationRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceShareConversationMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.ForkConversation
+ */
+export function runtimeServiceForkConversation(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<ForkConversationRequest, "instanceId">>,
+): Promise<ForkConversationResponse> {
+  return client.runtimeService.forkConversation({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceForkConversationMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ForkConversationResponse,
+      unknown,
+      PartialMessage<Omit<ForkConversationRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  ForkConversationResponse,
+  unknown,
+  PartialMessage<Omit<ForkConversationRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceForkConversation(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceForkConversationMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      ForkConversationResponse,
+      unknown,
+      PartialMessage<Omit<ForkConversationRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  ForkConversationResponse,
+  unknown,
+  PartialMessage<Omit<ForkConversationRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceForkConversationMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.Complete
+ */
+export function runtimeServiceComplete(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<CompleteRequest, "instanceId">>,
+): Promise<CompleteResponse> {
+  return client.runtimeService.complete({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceCompleteMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      CompleteResponse,
+      unknown,
+      PartialMessage<Omit<CompleteRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  CompleteResponse,
+  unknown,
+  PartialMessage<Omit<CompleteRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceComplete(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceCompleteMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      CompleteResponse,
+      unknown,
+      PartialMessage<Omit<CompleteRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  CompleteResponse,
+  unknown,
+  PartialMessage<Omit<CompleteRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceCompleteMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GitStatus
+ */
+export function runtimeServiceGitStatus(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GitStatusRequest, "instanceId">>,
+): Promise<GitStatusResponse> {
+  return client.runtimeService.gitStatus({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGitStatusMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitStatusResponse,
+      unknown,
+      PartialMessage<Omit<GitStatusRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GitStatusResponse,
+  unknown,
+  PartialMessage<Omit<GitStatusRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGitStatus(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGitStatusMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitStatusResponse,
+      unknown,
+      PartialMessage<Omit<GitStatusRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GitStatusResponse,
+  unknown,
+  PartialMessage<Omit<GitStatusRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGitStatusMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GitCommit
+ */
+export function runtimeServiceGitCommit(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GitCommitRequest, "instanceId">>,
+): Promise<GitCommitResponse> {
+  return client.runtimeService.gitCommit({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGitCommitMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitCommitResponse,
+      unknown,
+      PartialMessage<Omit<GitCommitRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GitCommitResponse,
+  unknown,
+  PartialMessage<Omit<GitCommitRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGitCommit(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGitCommitMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitCommitResponse,
+      unknown,
+      PartialMessage<Omit<GitCommitRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GitCommitResponse,
+  unknown,
+  PartialMessage<Omit<GitCommitRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGitCommitMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.RestoreGitCommit
+ */
+export function runtimeServiceRestoreGitCommit(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>,
+): Promise<RestoreGitCommitResponse> {
+  return client.runtimeService.restoreGitCommit({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceRestoreGitCommitMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      RestoreGitCommitResponse,
+      unknown,
+      PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  RestoreGitCommitResponse,
+  unknown,
+  PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceRestoreGitCommit(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceRestoreGitCommitMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      RestoreGitCommitResponse,
+      unknown,
+      PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  RestoreGitCommitResponse,
+  unknown,
+  PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceRestoreGitCommitMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GitMergeToBranch
+ */
+export function runtimeServiceGitMergeToBranch(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>,
+): Promise<GitMergeToBranchResponse> {
+  return client.runtimeService.gitMergeToBranch({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGitMergeToBranchMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitMergeToBranchResponse,
+      unknown,
+      PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GitMergeToBranchResponse,
+  unknown,
+  PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGitMergeToBranch(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGitMergeToBranchMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitMergeToBranchResponse,
+      unknown,
+      PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GitMergeToBranchResponse,
+  unknown,
+  PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGitMergeToBranchMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GitSwitchBranch
+ */
+export function runtimeServiceGitSwitchBranch(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>,
+): Promise<GitSwitchBranchResponse> {
+  return client.runtimeService.gitSwitchBranch({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGitSwitchBranchMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitSwitchBranchResponse,
+      unknown,
+      PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GitSwitchBranchResponse,
+  unknown,
+  PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGitSwitchBranch(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGitSwitchBranchMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitSwitchBranchResponse,
+      unknown,
+      PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GitSwitchBranchResponse,
+  unknown,
+  PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGitSwitchBranchMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GitPull
+ */
+export function runtimeServiceGitPull(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GitPullRequest, "instanceId">>,
+): Promise<GitPullResponse> {
+  return client.runtimeService.gitPull({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGitPullMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitPullResponse,
+      unknown,
+      PartialMessage<Omit<GitPullRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GitPullResponse,
+  unknown,
+  PartialMessage<Omit<GitPullRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGitPull(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGitPullMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitPullResponse,
+      unknown,
+      PartialMessage<Omit<GitPullRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GitPullResponse,
+  unknown,
+  PartialMessage<Omit<GitPullRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGitPullMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}
+
+/**
+ * Raw RPC call (mutation): RuntimeService.GitPush
+ */
+export function runtimeServiceGitPush(
+  client: RuntimeClient,
+  request: PartialMessage<Omit<GitPushRequest, "instanceId">>,
+): Promise<GitPushResponse> {
+  return client.runtimeService.gitPush({
+    instanceId: client.instanceId,
+    ...request,
+  });
+}
+
+export function getRuntimeServiceGitPushMutationOptions(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitPushResponse,
+      unknown,
+      PartialMessage<Omit<GitPushRequest, "instanceId">>
+    >
+  >,
+): CreateMutationOptions<
+  GitPushResponse,
+  unknown,
+  PartialMessage<Omit<GitPushRequest, "instanceId">>
+> {
+  return {
+    mutationFn: (request) => runtimeServiceGitPush(client, request),
+    ...options,
+  };
+}
+
+export function createRuntimeServiceGitPushMutation(
+  client: RuntimeClient,
+  options?: Partial<
+    CreateMutationOptions<
+      GitPushResponse,
+      unknown,
+      PartialMessage<Omit<GitPushRequest, "instanceId">>
+    >
+  >,
+  queryClient?: QueryClient,
+): CreateMutationResult<
+  GitPushResponse,
+  unknown,
+  PartialMessage<Omit<GitPushRequest, "instanceId">>
+> {
+  const mutationOptions = getRuntimeServiceGitPushMutationOptions(
+    client,
+    options,
+  );
+  return createMutation(mutationOptions, queryClient);
+}

From 8cdc22d856d6f71a52e11afded4621e68f5665d8 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 11:39:27 +0300
Subject: [PATCH 03/27] feat: update invalidation and query matching for dual
 key formats (Phase 3)

Update cache invalidation and query matchers to support both the old
URL-path query key format ("/v1/instances/{id}/...") and the new
service/method format ("QueryService", "metricsViewAggregation",
instanceId, request).

This enables incremental migration: as consumers switch from Orval
hooks to v2 generated hooks, both key formats are correctly matched
for invalidation, profiling, metrics view, and component queries.
---
 web-common/src/runtime-client/invalidation.ts | 117 ++++++++++++++++--
 .../src/runtime-client/query-matcher.ts       | 106 +++++++++++++++-
 2 files changed, 206 insertions(+), 17 deletions(-)

diff --git a/web-common/src/runtime-client/invalidation.ts b/web-common/src/runtime-client/invalidation.ts
index 0fe6eca83d1..2a02c660309 100644
--- a/web-common/src/runtime-client/invalidation.ts
+++ b/web-common/src/runtime-client/invalidation.ts
@@ -6,16 +6,78 @@ import {
 } from "@rilldata/web-common/runtime-client/query-matcher";
 import type { Query, QueryClient } from "@tanstack/svelte-query";
 
-// invalidation helpers
+// --- Query key format helpers ---
+// During migration, queries may use either the old URL-path format
+// (e.g. ["/v1/instances/{id}/..."]) or the new service/method format
+// (e.g. ["QueryService", "metricsViewAggregation", instanceId, request]).
+
+/** Matches both old and new key formats for a given instanceId. */
+function isRuntimeQueryForInstance(
+  queryKey: readonly unknown[],
+  instanceId: string,
+): boolean {
+  // New format: [ServiceName, methodName, instanceId, request]
+  if (queryKey.length >= 3 && queryKey[2] === instanceId) {
+    const svc = queryKey[0];
+    return (
+      svc === "QueryService" ||
+      svc === "RuntimeService" ||
+      svc === "ConnectorService"
+    );
+  }
+  // Old format: ["/v1/instances/{instanceId}/..."]
+  return (
+    typeof queryKey[0] === "string" &&
+    queryKey[0].startsWith(`/v1/instances/${instanceId}`)
+  );
+}
+
+/** Checks if a query key matches a metrics view query (by name). */
+function isMetricsViewQueryKey(
+  queryKey: readonly unknown[],
+  metricsViewName: string,
+): boolean {
+  // New format: ["QueryService", "metricsView*", instanceId, { metricsViewName, ... }]
+  if (
+    queryKey[0] === "QueryService" &&
+    typeof queryKey[1] === "string" &&
+    queryKey[1].startsWith("metricsView")
+  ) {
+    const request = queryKey[3];
+    return (
+      typeof request === "object" &&
+      request !== null &&
+      (request as Record<string, unknown>).metricsViewName === metricsViewName
+    );
+  }
+  return false;
+}
+
+/** Checks if a query key matches a component resolve query (by name). */
+function isComponentResolveKey(
+  queryKey: readonly unknown[],
+  componentName: string,
+): boolean {
+  // New format: ["QueryService", "resolveComponent", instanceId, { component: name }]
+  if (queryKey[0] === "QueryService" && queryKey[1] === "resolveComponent") {
+    const request = queryKey[3];
+    return (
+      typeof request === "object" &&
+      request !== null &&
+      (request as Record<string, unknown>).component === componentName
+    );
+  }
+  return false;
+}
+
+// --- invalidation helpers ---
 
 export function invalidateRuntimeQueries(
   queryClient: QueryClient,
   instanceId: string,
 ) {
   return queryClient.resetQueries({
-    predicate: (query) =>
-      typeof query.queryKey[0] === "string" &&
-      query.queryKey[0].startsWith(`/v1/instances/${instanceId}`),
+    predicate: (query) => isRuntimeQueryForInstance(query.queryKey, instanceId),
   });
 }
 
@@ -25,10 +87,14 @@ export function isMetricsViewQuery(queryHash: string, metricsViewName: string) {
   );
   return r.test(queryHash);
 }
+
 export function invalidationForMetricsViewData(
   query: Query,
   metricsViewName: string,
 ) {
+  // New key format
+  if (isMetricsViewQueryKey(query.queryKey, metricsViewName)) return true;
+  // Old key format
   return (
     typeof query.queryKey[0] === "string" &&
     isMetricsViewQuery(query.queryKey[0], metricsViewName)
@@ -71,9 +137,21 @@ export async function invalidateAllMetricsViews(
   // Second, refetch the resource entries (which returns the available dimensions and measures)
   await queryClient.refetchQueries({
     type: "active",
-    predicate: (query) =>
-      typeof query.queryKey[0] === "string" &&
-      query.queryKey[0].startsWith(`/v1/instances/${instanceId}/resource`),
+    predicate: (query) => {
+      const key = query.queryKey;
+      // New format: ["RuntimeService", "getResource" or "listResources", instanceId, ...]
+      if (
+        key[0] === "RuntimeService" &&
+        (key[1] === "getResource" || key[1] === "listResources") &&
+        key[2] === instanceId
+      )
+        return true;
+      // Old format
+      return (
+        typeof key[0] === "string" &&
+        key[0].startsWith(`/v1/instances/${instanceId}/resource`)
+      );
+    },
   });
 
   // Third, reset queries for all metrics views. This will cause the active queries to refetch.
@@ -81,11 +159,20 @@ export async function invalidateAllMetricsViews(
   // nor `queryClient.invalidateQueries` were working as expected. Perhaps there's a race condition somewhere.
   void queryClient.resetQueries({
     predicate: (query: Query) => {
+      const key = query.queryKey;
+      // New format: ["QueryService", "metricsView*", instanceId, ...]
+      if (
+        key[0] === "QueryService" &&
+        typeof key[1] === "string" &&
+        key[1].startsWith("metricsView") &&
+        key[2] === instanceId
+      ) {
+        return true;
+      }
+      // Old format
       return (
-        typeof query.queryKey[0] === "string" &&
-        query.queryKey[0].startsWith(
-          `/v1/instances/${instanceId}/queries/metrics-views`,
-        )
+        typeof key[0] === "string" &&
+        key[0].startsWith(`/v1/instances/${instanceId}/queries/metrics-views`)
       );
     },
   });
@@ -134,14 +221,18 @@ export async function invalidateComponentData(
     `/v1/instances/[a-zA-Z0-9-]+/queries/components/${name}/resolve`,
   );
 
+  const matchesComponent = (query: Query) =>
+    isComponentResolveKey(query.queryKey, name) ||
+    componentAPIRegex.test(query.queryHash);
+
   queryClient.removeQueries({
-    predicate: (query) => componentAPIRegex.test(query.queryHash),
+    predicate: matchesComponent,
     type: "inactive",
   });
   if (failed) return;
 
   return queryClient.resetQueries({
-    predicate: (query) => componentAPIRegex.test(query.queryHash),
+    predicate: matchesComponent,
     type: "active",
   });
 }
diff --git a/web-common/src/runtime-client/query-matcher.ts b/web-common/src/runtime-client/query-matcher.ts
index f2d9425f7eb..b9f5aeb92f3 100644
--- a/web-common/src/runtime-client/query-matcher.ts
+++ b/web-common/src/runtime-client/query-matcher.ts
@@ -2,12 +2,34 @@ import type { Query } from "@tanstack/query-core";
 import { ResourceKind } from "../features/entity-management/resource-selectors";
 
 export function isRuntimeQuery(query: Query): boolean {
-  const [apiPath] = query.queryKey as string[];
-  return apiPath.startsWith("/v1/instances/");
+  const key = query.queryKey;
+  // New format: [ServiceName, methodName, instanceId, request]
+  const svc = key[0];
+  if (
+    svc === "QueryService" ||
+    svc === "RuntimeService" ||
+    svc === "ConnectorService"
+  ) {
+    return true;
+  }
+  // Old format: ["/v1/instances/..."]
+  return typeof svc === "string" && svc.startsWith("/v1/instances/");
 }
 
 export function isGetResourceMetricsViewQuery(query: Query): boolean {
-  const [apiPath, queryParams] = query.queryKey; // Renamed for clarity
+  const key = query.queryKey;
+  // New format: ["RuntimeService", "getResource", instanceId, { "name.kind": ... }]
+  if (key[0] === "RuntimeService" && key[1] === "getResource") {
+    const request = key[3];
+    return (
+      typeof request === "object" &&
+      request !== null &&
+      (request as Record<string, unknown>)["name.kind"] ===
+        ResourceKind.MetricsView
+    );
+  }
+  // Old format
+  const [apiPath, queryParams] = key;
   if (
     typeof apiPath !== "string" ||
     typeof queryParams !== "object" ||
@@ -16,7 +38,8 @@ export function isGetResourceMetricsViewQuery(query: Query): boolean {
     return false;
   return (
     apiPath.startsWith("/v1/instances/") &&
-    queryParams["name.kind"] === ResourceKind.MetricsView
+    (queryParams as Record<string, unknown>)["name.kind"] ===
+      ResourceKind.MetricsView
   );
 }
 
@@ -42,6 +65,35 @@ export enum QueryRequestType {
   TableRows = "rows",
 }
 
+// New format method names that correspond to profiling queries
+const profilingMethods = new Set([
+  "columnRollupInterval",
+  "columnTopK",
+  "columnNullCount",
+  "columnDescriptiveStatistics",
+  "columnTimeGrain",
+  "columnNumericHistogram",
+  "columnRugHistogram",
+  "columnTimeRange",
+  "columnCardinality",
+  "columnTimeSeries",
+  "tableCardinality",
+  "tableColumns",
+  "tableRows",
+]);
+
+const tableProfilingMethods = new Set([
+  "tableCardinality",
+  "tableColumns",
+  "tableRows",
+]);
+
+/** Extract the table name from a new-format profiling query's request object */
+function getTableNameFromRequest(request: unknown): string | undefined {
+  if (typeof request !== "object" || request === null) return undefined;
+  return (request as Record<string, unknown>).tableName as string | undefined;
+}
+
 const TableProfilingQuery: Partial<Record<QueryRequestType, boolean>> = {
   [QueryRequestType.TableCardinality]: true,
   [QueryRequestType.TableColumns]: true,
@@ -58,7 +110,33 @@ function isOlapQuery(queryHash: string, name: string) {
   );
 }
 
+function isNewFormatOlapQuery(query: Query, name: string): boolean {
+  const key = query.queryKey;
+  if (
+    key[0] === "ConnectorService" &&
+    (key[1] === "oLAPGetTable" || key[1] === "oLAPListTables")
+  ) {
+    const request = key[3];
+    return (
+      typeof request === "object" &&
+      request !== null &&
+      (request as Record<string, unknown>).table === name
+    );
+  }
+  return false;
+}
+
 export function isProfilingQuery(query: Query, name: string): boolean {
+  // New format
+  if (
+    query.queryKey[0] === "QueryService" &&
+    profilingMethods.has(query.queryKey[1] as string)
+  ) {
+    const tableName = getTableNameFromRequest(query.queryKey[3]);
+    return tableName === name;
+  }
+  if (isNewFormatOlapQuery(query, name)) return true;
+  // Old format
   const queryExtractorMatch = ProfilingQueryExtractor.exec(query.queryHash);
   if (!queryExtractorMatch) return isOlapQuery(query.queryHash, name);
 
@@ -67,6 +145,16 @@ export function isProfilingQuery(query: Query, name: string): boolean {
 }
 
 export function isTableProfilingQuery(query: Query, name: string): boolean {
+  // New format
+  if (
+    query.queryKey[0] === "QueryService" &&
+    tableProfilingMethods.has(query.queryKey[1] as string)
+  ) {
+    const tableName = getTableNameFromRequest(query.queryKey[3]);
+    return tableName === name;
+  }
+  if (isNewFormatOlapQuery(query, name)) return true;
+  // Old format
   const queryExtractorMatch = ProfilingQueryExtractor.exec(query.queryHash);
   if (!queryExtractorMatch) return isOlapQuery(query.queryHash, name);
 
@@ -75,6 +163,16 @@ export function isTableProfilingQuery(query: Query, name: string): boolean {
 }
 
 export function isColumnProfilingQuery(query: Query, name: string) {
+  // New format
+  if (
+    query.queryKey[0] === "QueryService" &&
+    profilingMethods.has(query.queryKey[1] as string) &&
+    !tableProfilingMethods.has(query.queryKey[1] as string)
+  ) {
+    const tableName = getTableNameFromRequest(query.queryKey[3]);
+    return tableName === name;
+  }
+  // Old format
   const queryExtractorMatch = ProfilingQueryExtractor.exec(query.queryHash);
   if (!queryExtractorMatch) return false;
 

From 3aaa80dc7f5b9720149d25ab090705173a6b8fdf Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 12:07:30 +0300
Subject: [PATCH 04/27] fix: resolve type errors in generated query hooks

The generator was producing `PartialMessage<Omit<Request, "instanceId">>`,
but `Omit<...>` strips the `Message<T>` constraint that `PartialMessage`
requires. Fix by swapping to `Omit<PartialMessage<Request>, "instanceId">`.

Also detect at generation time whether each request type actually has an
`instanceId` field; methods like `ListInstances` and `IssueDevJWT` don't
have it and should not receive auto-injection.
---
 web-common/scripts/generate-query-hooks.ts    |  49 +-
 .../v2/gen/connector-service.ts               |  56 +-
 .../runtime-client/v2/gen/query-service.ts    | 278 +++++-----
 .../runtime-client/v2/gen/runtime-service.ts  | 480 +++++++++---------
 4 files changed, 440 insertions(+), 423 deletions(-)

diff --git a/web-common/scripts/generate-query-hooks.ts b/web-common/scripts/generate-query-hooks.ts
index d5667e573fe..cd0d86d5450 100644
--- a/web-common/scripts/generate-query-hooks.ts
+++ b/web-common/scripts/generate-query-hooks.ts
@@ -28,7 +28,8 @@ interface ServiceDef {
     string,
     {
       name: string;
-      I: { typeName: string };
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      I: { typeName: string; new (): any };
       O: { typeName: string };
       kind: MethodKind;
     }
@@ -45,6 +46,8 @@ interface MethodInfo {
   /** Response message type name (e.g. "MetricsViewAggregationResponse") */
   outputType: string;
   classification: MethodClassification;
+  /** Whether the request type has an instanceId field */
+  hasInstanceId: boolean;
 }
 
 // --- Helpers ---
@@ -102,12 +105,15 @@ function extractMethods(service: ServiceDef): MethodInfo[] {
     const classification = classifyMethod(serviceName, key);
     if (classification === "skip") continue;
 
+    const hasInstanceId = "instanceId" in new method.I();
+
     methods.push({
       methodKey: key,
       methodName: method.name,
       inputType: extractShortName(method.I.typeName),
       outputType: extractShortName(method.O.typeName),
       classification,
+      hasInstanceId,
     });
   }
 
@@ -171,14 +177,19 @@ function generateServiceFile(service: ServiceDef): string {
 
   // --- Query methods ---
   for (const m of queryMethods) {
-    const fnPrefix = `${serviceClientProp.charAt(0).toLowerCase() + serviceClientProp.slice(1)}${pascalCase(m.methodKey)}`;
-    // Use the same naming convention: serviceName + methodName (e.g. queryServiceMetricsViewAggregation)
-
     const fullName = `${serviceClientProp}${pascalCase(m.methodKey)}`;
     const keyFnName = `get${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}QueryKey`;
     const optsFnName = `get${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}QueryOptions`;
     const hookName = `create${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}`;
 
+    // Request type: omit instanceId when the proto message has it (client injects it)
+    const requestType = m.hasInstanceId
+      ? `Omit<PartialMessage<${m.inputType}>, "instanceId">`
+      : `PartialMessage<${m.inputType}>`;
+    const requestSpread = m.hasInstanceId
+      ? `{ instanceId: client.instanceId, ...request }`
+      : `request`;
+
     // Tier 1: Raw function
     lines.push(
       `/**`,
@@ -186,11 +197,11 @@ function generateServiceFile(service: ServiceDef): string {
       ` */`,
       `export function ${fullName}(`,
       `  client: RuntimeClient,`,
-      `  request: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `  request: ${requestType},`,
       `  options?: { signal?: AbortSignal },`,
       `): Promise<${m.outputType}> {`,
       `  return client.${serviceClientProp}.${m.methodKey}(`,
-      `    { instanceId: client.instanceId, ...request },`,
+      `    ${requestSpread},`,
       `    { signal: options?.signal },`,
       `  );`,
       `}`,
@@ -201,7 +212,7 @@ function generateServiceFile(service: ServiceDef): string {
     lines.push(
       `export function ${keyFnName}(`,
       `  instanceId: string,`,
-      `  request?: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `  request?: ${requestType},`,
       `): QueryKey {`,
       `  return ["${serviceName}", "${m.methodKey}", instanceId, request ?? {}] as const;`,
       `}`,
@@ -212,7 +223,7 @@ function generateServiceFile(service: ServiceDef): string {
     lines.push(
       `export function ${optsFnName}(`,
       `  client: RuntimeClient,`,
-      `  request: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `  request: ${requestType},`,
       `  options?: {`,
       `    query?: Partial<CreateQueryOptions<${m.outputType}>>;`,
       `  },`,
@@ -234,7 +245,7 @@ function generateServiceFile(service: ServiceDef): string {
     lines.push(
       `export function ${hookName}(`,
       `  client: RuntimeClient,`,
-      `  request: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `  request: ${requestType},`,
       `  options?: {`,
       `    query?: Partial<CreateQueryOptions<${m.outputType}>>;`,
       `  },`,
@@ -253,6 +264,14 @@ function generateServiceFile(service: ServiceDef): string {
     const mutOptsFnName = `get${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}MutationOptions`;
     const mutHookName = `create${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}Mutation`;
 
+    // Request type: omit instanceId when the proto message has it
+    const requestType = m.hasInstanceId
+      ? `Omit<PartialMessage<${m.inputType}>, "instanceId">`
+      : `PartialMessage<${m.inputType}>`;
+    const requestSpread = m.hasInstanceId
+      ? `{ instanceId: client.instanceId, ...request }`
+      : `request`;
+
     // Raw function
     lines.push(
       `/**`,
@@ -260,10 +279,10 @@ function generateServiceFile(service: ServiceDef): string {
       ` */`,
       `export function ${fullName}(`,
       `  client: RuntimeClient,`,
-      `  request: PartialMessage<Omit<${m.inputType}, "instanceId">>,`,
+      `  request: ${requestType},`,
       `): Promise<${m.outputType}> {`,
       `  return client.${serviceClientProp}.${m.methodKey}(`,
-      `    { instanceId: client.instanceId, ...request },`,
+      `    ${requestSpread},`,
       `  );`,
       `}`,
       ``,
@@ -273,8 +292,8 @@ function generateServiceFile(service: ServiceDef): string {
     lines.push(
       `export function ${mutOptsFnName}(`,
       `  client: RuntimeClient,`,
-      `  options?: Partial<CreateMutationOptions<${m.outputType}, unknown, PartialMessage<Omit<${m.inputType}, "instanceId">>>>,`,
-      `): CreateMutationOptions<${m.outputType}, unknown, PartialMessage<Omit<${m.inputType}, "instanceId">>> {`,
+      `  options?: Partial<CreateMutationOptions<${m.outputType}, unknown, ${requestType}>>,`,
+      `): CreateMutationOptions<${m.outputType}, unknown, ${requestType}> {`,
       `  return {`,
       `    mutationFn: (request) => ${fullName}(client, request),`,
       `    ...options,`,
@@ -287,9 +306,9 @@ function generateServiceFile(service: ServiceDef): string {
     lines.push(
       `export function ${mutHookName}(`,
       `  client: RuntimeClient,`,
-      `  options?: Partial<CreateMutationOptions<${m.outputType}, unknown, PartialMessage<Omit<${m.inputType}, "instanceId">>>>,`,
+      `  options?: Partial<CreateMutationOptions<${m.outputType}, unknown, ${requestType}>>,`,
       `  queryClient?: QueryClient,`,
-      `): CreateMutationResult<${m.outputType}, unknown, PartialMessage<Omit<${m.inputType}, "instanceId">>> {`,
+      `): CreateMutationResult<${m.outputType}, unknown, ${requestType}> {`,
       `  const mutationOptions = ${mutOptsFnName}(client, options);`,
       `  return createMutation(mutationOptions, queryClient);`,
       `}`,
diff --git a/web-common/src/runtime-client/v2/gen/connector-service.ts b/web-common/src/runtime-client/v2/gen/connector-service.ts
index f8006491856..ab996a238f9 100644
--- a/web-common/src/runtime-client/v2/gen/connector-service.ts
+++ b/web-common/src/runtime-client/v2/gen/connector-service.ts
@@ -35,7 +35,7 @@ import {
  */
 export function connectorServiceListBuckets(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListBucketsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListBucketsResponse> {
   return client.connectorService.listBuckets(
@@ -46,7 +46,7 @@ export function connectorServiceListBuckets(
 
 export function getConnectorServiceListBucketsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListBucketsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "ConnectorService",
@@ -58,7 +58,7 @@ export function getConnectorServiceListBucketsQueryKey(
 
 export function getConnectorServiceListBucketsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListBucketsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListBucketsResponse>>;
   },
@@ -79,7 +79,7 @@ export function getConnectorServiceListBucketsQueryOptions(
 
 export function createConnectorServiceListBuckets(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListBucketsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListBucketsResponse>>;
   },
@@ -98,7 +98,7 @@ export function createConnectorServiceListBuckets(
  */
 export function connectorServiceListObjects(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListObjectsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListObjectsResponse> {
   return client.connectorService.listObjects(
@@ -109,7 +109,7 @@ export function connectorServiceListObjects(
 
 export function getConnectorServiceListObjectsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListObjectsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "ConnectorService",
@@ -121,7 +121,7 @@ export function getConnectorServiceListObjectsQueryKey(
 
 export function getConnectorServiceListObjectsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListObjectsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListObjectsResponse>>;
   },
@@ -142,7 +142,7 @@ export function getConnectorServiceListObjectsQueryOptions(
 
 export function createConnectorServiceListObjects(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListObjectsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListObjectsResponse>>;
   },
@@ -161,7 +161,7 @@ export function createConnectorServiceListObjects(
  */
 export function connectorServiceOLAPListTables(
   client: RuntimeClient,
-  request: PartialMessage<Omit<OLAPListTablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<OLAPListTablesResponse> {
   return client.connectorService.oLAPListTables(
@@ -172,7 +172,7 @@ export function connectorServiceOLAPListTables(
 
 export function getConnectorServiceOLAPListTablesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<OLAPListTablesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
 ): QueryKey {
   return [
     "ConnectorService",
@@ -184,7 +184,7 @@ export function getConnectorServiceOLAPListTablesQueryKey(
 
 export function getConnectorServiceOLAPListTablesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<OLAPListTablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<OLAPListTablesResponse>>;
   },
@@ -205,7 +205,7 @@ export function getConnectorServiceOLAPListTablesQueryOptions(
 
 export function createConnectorServiceOLAPListTables(
   client: RuntimeClient,
-  request: PartialMessage<Omit<OLAPListTablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<OLAPListTablesResponse>>;
   },
@@ -224,7 +224,7 @@ export function createConnectorServiceOLAPListTables(
  */
 export function connectorServiceOLAPGetTable(
   client: RuntimeClient,
-  request: PartialMessage<Omit<OLAPGetTableRequest, "instanceId">>,
+  request: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<OLAPGetTableResponse> {
   return client.connectorService.oLAPGetTable(
@@ -235,7 +235,7 @@ export function connectorServiceOLAPGetTable(
 
 export function getConnectorServiceOLAPGetTableQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<OLAPGetTableRequest, "instanceId">>,
+  request?: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
 ): QueryKey {
   return [
     "ConnectorService",
@@ -247,7 +247,7 @@ export function getConnectorServiceOLAPGetTableQueryKey(
 
 export function getConnectorServiceOLAPGetTableQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<OLAPGetTableRequest, "instanceId">>,
+  request: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<OLAPGetTableResponse>>;
   },
@@ -268,7 +268,7 @@ export function getConnectorServiceOLAPGetTableQueryOptions(
 
 export function createConnectorServiceOLAPGetTable(
   client: RuntimeClient,
-  request: PartialMessage<Omit<OLAPGetTableRequest, "instanceId">>,
+  request: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<OLAPGetTableResponse>>;
   },
@@ -287,7 +287,7 @@ export function createConnectorServiceOLAPGetTable(
  */
 export function connectorServiceListDatabaseSchemas(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListDatabaseSchemasRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListDatabaseSchemasResponse> {
   return client.connectorService.listDatabaseSchemas(
@@ -298,7 +298,7 @@ export function connectorServiceListDatabaseSchemas(
 
 export function getConnectorServiceListDatabaseSchemasQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListDatabaseSchemasRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
 ): QueryKey {
   return [
     "ConnectorService",
@@ -310,7 +310,7 @@ export function getConnectorServiceListDatabaseSchemasQueryKey(
 
 export function getConnectorServiceListDatabaseSchemasQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListDatabaseSchemasRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListDatabaseSchemasResponse>>;
   },
@@ -331,7 +331,7 @@ export function getConnectorServiceListDatabaseSchemasQueryOptions(
 
 export function createConnectorServiceListDatabaseSchemas(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListDatabaseSchemasRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListDatabaseSchemasResponse>>;
   },
@@ -350,7 +350,7 @@ export function createConnectorServiceListDatabaseSchemas(
  */
 export function connectorServiceListTables(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListTablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListTablesResponse> {
   return client.connectorService.listTables(
@@ -361,14 +361,14 @@ export function connectorServiceListTables(
 
 export function getConnectorServiceListTablesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListTablesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
 ): QueryKey {
   return ["ConnectorService", "listTables", instanceId, request ?? {}] as const;
 }
 
 export function getConnectorServiceListTablesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListTablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListTablesResponse>>;
   },
@@ -389,7 +389,7 @@ export function getConnectorServiceListTablesQueryOptions(
 
 export function createConnectorServiceListTables(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListTablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListTablesResponse>>;
   },
@@ -408,7 +408,7 @@ export function createConnectorServiceListTables(
  */
 export function connectorServiceGetTable(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetTableRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetTableRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<GetTableResponse> {
   return client.connectorService.getTable(
@@ -419,14 +419,14 @@ export function connectorServiceGetTable(
 
 export function getConnectorServiceGetTableQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<GetTableRequest, "instanceId">>,
+  request?: Omit<PartialMessage<GetTableRequest>, "instanceId">,
 ): QueryKey {
   return ["ConnectorService", "getTable", instanceId, request ?? {}] as const;
 }
 
 export function getConnectorServiceGetTableQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetTableRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetTableRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetTableResponse>>;
   },
@@ -447,7 +447,7 @@ export function getConnectorServiceGetTableQueryOptions(
 
 export function createConnectorServiceGetTable(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetTableRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetTableRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetTableResponse>>;
   },
diff --git a/web-common/src/runtime-client/v2/gen/query-service.ts b/web-common/src/runtime-client/v2/gen/query-service.ts
index 0945495cf0f..3370d890d54 100644
--- a/web-common/src/runtime-client/v2/gen/query-service.ts
+++ b/web-common/src/runtime-client/v2/gen/query-service.ts
@@ -83,7 +83,7 @@ import {
  */
 export function queryServiceMetricsViewAggregation(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewAggregationRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewAggregationRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewAggregationResponse> {
   return client.queryService.metricsViewAggregation(
@@ -94,7 +94,7 @@ export function queryServiceMetricsViewAggregation(
 
 export function getQueryServiceMetricsViewAggregationQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewAggregationRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewAggregationRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -106,7 +106,7 @@ export function getQueryServiceMetricsViewAggregationQueryKey(
 
 export function getQueryServiceMetricsViewAggregationQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewAggregationRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewAggregationRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewAggregationResponse>>;
   },
@@ -127,7 +127,7 @@ export function getQueryServiceMetricsViewAggregationQueryOptions(
 
 export function createQueryServiceMetricsViewAggregation(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewAggregationRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewAggregationRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewAggregationResponse>>;
   },
@@ -146,7 +146,7 @@ export function createQueryServiceMetricsViewAggregation(
  */
 export function queryServiceMetricsViewToplist(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewToplistRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewToplistRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewToplistResponse> {
   return client.queryService.metricsViewToplist(
@@ -157,7 +157,7 @@ export function queryServiceMetricsViewToplist(
 
 export function getQueryServiceMetricsViewToplistQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewToplistRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewToplistRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -169,7 +169,7 @@ export function getQueryServiceMetricsViewToplistQueryKey(
 
 export function getQueryServiceMetricsViewToplistQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewToplistRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewToplistRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewToplistResponse>>;
   },
@@ -190,7 +190,7 @@ export function getQueryServiceMetricsViewToplistQueryOptions(
 
 export function createQueryServiceMetricsViewToplist(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewToplistRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewToplistRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewToplistResponse>>;
   },
@@ -209,7 +209,7 @@ export function createQueryServiceMetricsViewToplist(
  */
 export function queryServiceMetricsViewComparison(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewComparisonRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewComparisonRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewComparisonResponse> {
   return client.queryService.metricsViewComparison(
@@ -220,7 +220,7 @@ export function queryServiceMetricsViewComparison(
 
 export function getQueryServiceMetricsViewComparisonQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewComparisonRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewComparisonRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -232,7 +232,7 @@ export function getQueryServiceMetricsViewComparisonQueryKey(
 
 export function getQueryServiceMetricsViewComparisonQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewComparisonRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewComparisonRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewComparisonResponse>>;
   },
@@ -253,7 +253,7 @@ export function getQueryServiceMetricsViewComparisonQueryOptions(
 
 export function createQueryServiceMetricsViewComparison(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewComparisonRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewComparisonRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewComparisonResponse>>;
   },
@@ -272,7 +272,7 @@ export function createQueryServiceMetricsViewComparison(
  */
 export function queryServiceMetricsViewTimeSeries(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeSeriesRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeSeriesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewTimeSeriesResponse> {
   return client.queryService.metricsViewTimeSeries(
@@ -283,7 +283,7 @@ export function queryServiceMetricsViewTimeSeries(
 
 export function getQueryServiceMetricsViewTimeSeriesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewTimeSeriesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewTimeSeriesRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -295,7 +295,7 @@ export function getQueryServiceMetricsViewTimeSeriesQueryKey(
 
 export function getQueryServiceMetricsViewTimeSeriesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeSeriesRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeSeriesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewTimeSeriesResponse>>;
   },
@@ -316,7 +316,7 @@ export function getQueryServiceMetricsViewTimeSeriesQueryOptions(
 
 export function createQueryServiceMetricsViewTimeSeries(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeSeriesRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeSeriesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewTimeSeriesResponse>>;
   },
@@ -335,7 +335,7 @@ export function createQueryServiceMetricsViewTimeSeries(
  */
 export function queryServiceMetricsViewTotals(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTotalsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTotalsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewTotalsResponse> {
   return client.queryService.metricsViewTotals(
@@ -346,7 +346,7 @@ export function queryServiceMetricsViewTotals(
 
 export function getQueryServiceMetricsViewTotalsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewTotalsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewTotalsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -358,7 +358,7 @@ export function getQueryServiceMetricsViewTotalsQueryKey(
 
 export function getQueryServiceMetricsViewTotalsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTotalsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTotalsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewTotalsResponse>>;
   },
@@ -379,7 +379,7 @@ export function getQueryServiceMetricsViewTotalsQueryOptions(
 
 export function createQueryServiceMetricsViewTotals(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTotalsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTotalsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewTotalsResponse>>;
   },
@@ -398,7 +398,7 @@ export function createQueryServiceMetricsViewTotals(
  */
 export function queryServiceMetricsViewRows(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewRowsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewRowsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewRowsResponse> {
   return client.queryService.metricsViewRows(
@@ -409,7 +409,7 @@ export function queryServiceMetricsViewRows(
 
 export function getQueryServiceMetricsViewRowsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewRowsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewRowsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -421,7 +421,7 @@ export function getQueryServiceMetricsViewRowsQueryKey(
 
 export function getQueryServiceMetricsViewRowsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewRowsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewRowsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewRowsResponse>>;
   },
@@ -442,7 +442,7 @@ export function getQueryServiceMetricsViewRowsQueryOptions(
 
 export function createQueryServiceMetricsViewRows(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewRowsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewRowsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewRowsResponse>>;
   },
@@ -461,7 +461,7 @@ export function createQueryServiceMetricsViewRows(
  */
 export function queryServiceMetricsViewTimeRange(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeRangeRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewTimeRangeResponse> {
   return client.queryService.metricsViewTimeRange(
@@ -472,7 +472,7 @@ export function queryServiceMetricsViewTimeRange(
 
 export function getQueryServiceMetricsViewTimeRangeQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewTimeRangeRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -484,7 +484,7 @@ export function getQueryServiceMetricsViewTimeRangeQueryKey(
 
 export function getQueryServiceMetricsViewTimeRangeQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeRangeRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewTimeRangeResponse>>;
   },
@@ -505,7 +505,7 @@ export function getQueryServiceMetricsViewTimeRangeQueryOptions(
 
 export function createQueryServiceMetricsViewTimeRange(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeRangeRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewTimeRangeResponse>>;
   },
@@ -524,7 +524,7 @@ export function createQueryServiceMetricsViewTimeRange(
  */
 export function queryServiceMetricsViewSchema(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewSchemaRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewSchemaResponse> {
   return client.queryService.metricsViewSchema(
@@ -535,7 +535,7 @@ export function queryServiceMetricsViewSchema(
 
 export function getQueryServiceMetricsViewSchemaQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewSchemaRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -547,7 +547,7 @@ export function getQueryServiceMetricsViewSchemaQueryKey(
 
 export function getQueryServiceMetricsViewSchemaQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewSchemaRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewSchemaResponse>>;
   },
@@ -568,7 +568,7 @@ export function getQueryServiceMetricsViewSchemaQueryOptions(
 
 export function createQueryServiceMetricsViewSchema(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewSchemaRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewSchemaResponse>>;
   },
@@ -587,7 +587,7 @@ export function createQueryServiceMetricsViewSchema(
  */
 export function queryServiceMetricsViewSearch(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewSearchRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewSearchResponse> {
   return client.queryService.metricsViewSearch(
@@ -598,7 +598,7 @@ export function queryServiceMetricsViewSearch(
 
 export function getQueryServiceMetricsViewSearchQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewSearchRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -610,7 +610,7 @@ export function getQueryServiceMetricsViewSearchQueryKey(
 
 export function getQueryServiceMetricsViewSearchQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewSearchRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewSearchResponse>>;
   },
@@ -631,7 +631,7 @@ export function getQueryServiceMetricsViewSearchQueryOptions(
 
 export function createQueryServiceMetricsViewSearch(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewSearchRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewSearchResponse>>;
   },
@@ -650,7 +650,7 @@ export function createQueryServiceMetricsViewSearch(
  */
 export function queryServiceMetricsViewTimeRanges(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeRangesRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewTimeRangesResponse> {
   return client.queryService.metricsViewTimeRanges(
@@ -661,7 +661,7 @@ export function queryServiceMetricsViewTimeRanges(
 
 export function getQueryServiceMetricsViewTimeRangesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewTimeRangesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -673,7 +673,7 @@ export function getQueryServiceMetricsViewTimeRangesQueryKey(
 
 export function getQueryServiceMetricsViewTimeRangesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeRangesRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewTimeRangesResponse>>;
   },
@@ -694,7 +694,7 @@ export function getQueryServiceMetricsViewTimeRangesQueryOptions(
 
 export function createQueryServiceMetricsViewTimeRanges(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewTimeRangesRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewTimeRangesResponse>>;
   },
@@ -713,7 +713,7 @@ export function createQueryServiceMetricsViewTimeRanges(
  */
 export function queryServiceMetricsViewAnnotations(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewAnnotationsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<MetricsViewAnnotationsResponse> {
   return client.queryService.metricsViewAnnotations(
@@ -724,7 +724,7 @@ export function queryServiceMetricsViewAnnotations(
 
 export function getQueryServiceMetricsViewAnnotationsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<MetricsViewAnnotationsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -736,7 +736,7 @@ export function getQueryServiceMetricsViewAnnotationsQueryKey(
 
 export function getQueryServiceMetricsViewAnnotationsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewAnnotationsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewAnnotationsResponse>>;
   },
@@ -757,7 +757,7 @@ export function getQueryServiceMetricsViewAnnotationsQueryOptions(
 
 export function createQueryServiceMetricsViewAnnotations(
   client: RuntimeClient,
-  request: PartialMessage<Omit<MetricsViewAnnotationsRequest, "instanceId">>,
+  request: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<MetricsViewAnnotationsResponse>>;
   },
@@ -776,8 +776,9 @@ export function createQueryServiceMetricsViewAnnotations(
  */
 export function queryServiceConvertExpressionToMetricsSQL(
   client: RuntimeClient,
-  request: PartialMessage<
-    Omit<ConvertExpressionToMetricsSQLRequest, "instanceId">
+  request: Omit<
+    PartialMessage<ConvertExpressionToMetricsSQLRequest>,
+    "instanceId"
   >,
   options?: { signal?: AbortSignal },
 ): Promise<ConvertExpressionToMetricsSQLResponse> {
@@ -789,8 +790,9 @@ export function queryServiceConvertExpressionToMetricsSQL(
 
 export function getQueryServiceConvertExpressionToMetricsSQLQueryKey(
   instanceId: string,
-  request?: PartialMessage<
-    Omit<ConvertExpressionToMetricsSQLRequest, "instanceId">
+  request?: Omit<
+    PartialMessage<ConvertExpressionToMetricsSQLRequest>,
+    "instanceId"
   >,
 ): QueryKey {
   return [
@@ -803,8 +805,9 @@ export function getQueryServiceConvertExpressionToMetricsSQLQueryKey(
 
 export function getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<
-    Omit<ConvertExpressionToMetricsSQLRequest, "instanceId">
+  request: Omit<
+    PartialMessage<ConvertExpressionToMetricsSQLRequest>,
+    "instanceId"
   >,
   options?: {
     query?: Partial<CreateQueryOptions<ConvertExpressionToMetricsSQLResponse>>;
@@ -829,8 +832,9 @@ export function getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
 
 export function createQueryServiceConvertExpressionToMetricsSQL(
   client: RuntimeClient,
-  request: PartialMessage<
-    Omit<ConvertExpressionToMetricsSQLRequest, "instanceId">
+  request: Omit<
+    PartialMessage<ConvertExpressionToMetricsSQLRequest>,
+    "instanceId"
   >,
   options?: {
     query?: Partial<CreateQueryOptions<ConvertExpressionToMetricsSQLResponse>>;
@@ -850,7 +854,7 @@ export function createQueryServiceConvertExpressionToMetricsSQL(
  */
 export function queryServiceResolveCanvas(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveCanvasRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ResolveCanvasResponse> {
   return client.queryService.resolveCanvas(
@@ -861,14 +865,14 @@ export function queryServiceResolveCanvas(
 
 export function getQueryServiceResolveCanvasQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ResolveCanvasRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
 ): QueryKey {
   return ["QueryService", "resolveCanvas", instanceId, request ?? {}] as const;
 }
 
 export function getQueryServiceResolveCanvasQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveCanvasRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ResolveCanvasResponse>>;
   },
@@ -889,7 +893,7 @@ export function getQueryServiceResolveCanvasQueryOptions(
 
 export function createQueryServiceResolveCanvas(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveCanvasRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ResolveCanvasResponse>>;
   },
@@ -908,7 +912,7 @@ export function createQueryServiceResolveCanvas(
  */
 export function queryServiceResolveComponent(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveComponentRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ResolveComponentResponse> {
   return client.queryService.resolveComponent(
@@ -919,7 +923,7 @@ export function queryServiceResolveComponent(
 
 export function getQueryServiceResolveComponentQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ResolveComponentRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -931,7 +935,7 @@ export function getQueryServiceResolveComponentQueryKey(
 
 export function getQueryServiceResolveComponentQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveComponentRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ResolveComponentResponse>>;
   },
@@ -952,7 +956,7 @@ export function getQueryServiceResolveComponentQueryOptions(
 
 export function createQueryServiceResolveComponent(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveComponentRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ResolveComponentResponse>>;
   },
@@ -971,7 +975,7 @@ export function createQueryServiceResolveComponent(
  */
 export function queryServiceResolveTemplatedString(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveTemplatedStringRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ResolveTemplatedStringResponse> {
   return client.queryService.resolveTemplatedString(
@@ -982,7 +986,7 @@ export function queryServiceResolveTemplatedString(
 
 export function getQueryServiceResolveTemplatedStringQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ResolveTemplatedStringRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -994,7 +998,7 @@ export function getQueryServiceResolveTemplatedStringQueryKey(
 
 export function getQueryServiceResolveTemplatedStringQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveTemplatedStringRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ResolveTemplatedStringResponse>>;
   },
@@ -1015,7 +1019,7 @@ export function getQueryServiceResolveTemplatedStringQueryOptions(
 
 export function createQueryServiceResolveTemplatedString(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ResolveTemplatedStringRequest, "instanceId">>,
+  request: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ResolveTemplatedStringResponse>>;
   },
@@ -1034,7 +1038,7 @@ export function createQueryServiceResolveTemplatedString(
  */
 export function queryServiceColumnRollupInterval(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnRollupIntervalRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnRollupIntervalRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnRollupIntervalResponse> {
   return client.queryService.columnRollupInterval(
@@ -1045,7 +1049,7 @@ export function queryServiceColumnRollupInterval(
 
 export function getQueryServiceColumnRollupIntervalQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnRollupIntervalRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnRollupIntervalRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1057,7 +1061,7 @@ export function getQueryServiceColumnRollupIntervalQueryKey(
 
 export function getQueryServiceColumnRollupIntervalQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnRollupIntervalRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnRollupIntervalRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnRollupIntervalResponse>>;
   },
@@ -1078,7 +1082,7 @@ export function getQueryServiceColumnRollupIntervalQueryOptions(
 
 export function createQueryServiceColumnRollupInterval(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnRollupIntervalRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnRollupIntervalRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnRollupIntervalResponse>>;
   },
@@ -1097,7 +1101,7 @@ export function createQueryServiceColumnRollupInterval(
  */
 export function queryServiceColumnTopK(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTopKRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTopKRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnTopKResponse> {
   return client.queryService.columnTopK(
@@ -1108,14 +1112,14 @@ export function queryServiceColumnTopK(
 
 export function getQueryServiceColumnTopKQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnTopKRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnTopKRequest>, "instanceId">,
 ): QueryKey {
   return ["QueryService", "columnTopK", instanceId, request ?? {}] as const;
 }
 
 export function getQueryServiceColumnTopKQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTopKRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTopKRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnTopKResponse>>;
   },
@@ -1136,7 +1140,7 @@ export function getQueryServiceColumnTopKQueryOptions(
 
 export function createQueryServiceColumnTopK(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTopKRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTopKRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnTopKResponse>>;
   },
@@ -1155,7 +1159,7 @@ export function createQueryServiceColumnTopK(
  */
 export function queryServiceColumnNullCount(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnNullCountRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnNullCountRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnNullCountResponse> {
   return client.queryService.columnNullCount(
@@ -1166,7 +1170,7 @@ export function queryServiceColumnNullCount(
 
 export function getQueryServiceColumnNullCountQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnNullCountRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnNullCountRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1178,7 +1182,7 @@ export function getQueryServiceColumnNullCountQueryKey(
 
 export function getQueryServiceColumnNullCountQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnNullCountRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnNullCountRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnNullCountResponse>>;
   },
@@ -1199,7 +1203,7 @@ export function getQueryServiceColumnNullCountQueryOptions(
 
 export function createQueryServiceColumnNullCount(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnNullCountRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnNullCountRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnNullCountResponse>>;
   },
@@ -1218,8 +1222,9 @@ export function createQueryServiceColumnNullCount(
  */
 export function queryServiceColumnDescriptiveStatistics(
   client: RuntimeClient,
-  request: PartialMessage<
-    Omit<ColumnDescriptiveStatisticsRequest, "instanceId">
+  request: Omit<
+    PartialMessage<ColumnDescriptiveStatisticsRequest>,
+    "instanceId"
   >,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnDescriptiveStatisticsResponse> {
@@ -1231,8 +1236,9 @@ export function queryServiceColumnDescriptiveStatistics(
 
 export function getQueryServiceColumnDescriptiveStatisticsQueryKey(
   instanceId: string,
-  request?: PartialMessage<
-    Omit<ColumnDescriptiveStatisticsRequest, "instanceId">
+  request?: Omit<
+    PartialMessage<ColumnDescriptiveStatisticsRequest>,
+    "instanceId"
   >,
 ): QueryKey {
   return [
@@ -1245,8 +1251,9 @@ export function getQueryServiceColumnDescriptiveStatisticsQueryKey(
 
 export function getQueryServiceColumnDescriptiveStatisticsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<
-    Omit<ColumnDescriptiveStatisticsRequest, "instanceId">
+  request: Omit<
+    PartialMessage<ColumnDescriptiveStatisticsRequest>,
+    "instanceId"
   >,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnDescriptiveStatisticsResponse>>;
@@ -1271,8 +1278,9 @@ export function getQueryServiceColumnDescriptiveStatisticsQueryOptions(
 
 export function createQueryServiceColumnDescriptiveStatistics(
   client: RuntimeClient,
-  request: PartialMessage<
-    Omit<ColumnDescriptiveStatisticsRequest, "instanceId">
+  request: Omit<
+    PartialMessage<ColumnDescriptiveStatisticsRequest>,
+    "instanceId"
   >,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnDescriptiveStatisticsResponse>>;
@@ -1292,7 +1300,7 @@ export function createQueryServiceColumnDescriptiveStatistics(
  */
 export function queryServiceColumnTimeGrain(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeGrainRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeGrainRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnTimeGrainResponse> {
   return client.queryService.columnTimeGrain(
@@ -1303,7 +1311,7 @@ export function queryServiceColumnTimeGrain(
 
 export function getQueryServiceColumnTimeGrainQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnTimeGrainRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnTimeGrainRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1315,7 +1323,7 @@ export function getQueryServiceColumnTimeGrainQueryKey(
 
 export function getQueryServiceColumnTimeGrainQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeGrainRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeGrainRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnTimeGrainResponse>>;
   },
@@ -1336,7 +1344,7 @@ export function getQueryServiceColumnTimeGrainQueryOptions(
 
 export function createQueryServiceColumnTimeGrain(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeGrainRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeGrainRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnTimeGrainResponse>>;
   },
@@ -1355,7 +1363,7 @@ export function createQueryServiceColumnTimeGrain(
  */
 export function queryServiceColumnNumericHistogram(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnNumericHistogramRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnNumericHistogramRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnNumericHistogramResponse> {
   return client.queryService.columnNumericHistogram(
@@ -1366,7 +1374,7 @@ export function queryServiceColumnNumericHistogram(
 
 export function getQueryServiceColumnNumericHistogramQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnNumericHistogramRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnNumericHistogramRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1378,7 +1386,7 @@ export function getQueryServiceColumnNumericHistogramQueryKey(
 
 export function getQueryServiceColumnNumericHistogramQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnNumericHistogramRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnNumericHistogramRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnNumericHistogramResponse>>;
   },
@@ -1399,7 +1407,7 @@ export function getQueryServiceColumnNumericHistogramQueryOptions(
 
 export function createQueryServiceColumnNumericHistogram(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnNumericHistogramRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnNumericHistogramRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnNumericHistogramResponse>>;
   },
@@ -1418,7 +1426,7 @@ export function createQueryServiceColumnNumericHistogram(
  */
 export function queryServiceColumnRugHistogram(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnRugHistogramRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnRugHistogramRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnRugHistogramResponse> {
   return client.queryService.columnRugHistogram(
@@ -1429,7 +1437,7 @@ export function queryServiceColumnRugHistogram(
 
 export function getQueryServiceColumnRugHistogramQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnRugHistogramRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnRugHistogramRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1441,7 +1449,7 @@ export function getQueryServiceColumnRugHistogramQueryKey(
 
 export function getQueryServiceColumnRugHistogramQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnRugHistogramRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnRugHistogramRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnRugHistogramResponse>>;
   },
@@ -1462,7 +1470,7 @@ export function getQueryServiceColumnRugHistogramQueryOptions(
 
 export function createQueryServiceColumnRugHistogram(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnRugHistogramRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnRugHistogramRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnRugHistogramResponse>>;
   },
@@ -1481,7 +1489,7 @@ export function createQueryServiceColumnRugHistogram(
  */
 export function queryServiceColumnTimeRange(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeRangeRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeRangeRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnTimeRangeResponse> {
   return client.queryService.columnTimeRange(
@@ -1492,7 +1500,7 @@ export function queryServiceColumnTimeRange(
 
 export function getQueryServiceColumnTimeRangeQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnTimeRangeRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnTimeRangeRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1504,7 +1512,7 @@ export function getQueryServiceColumnTimeRangeQueryKey(
 
 export function getQueryServiceColumnTimeRangeQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeRangeRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeRangeRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnTimeRangeResponse>>;
   },
@@ -1525,7 +1533,7 @@ export function getQueryServiceColumnTimeRangeQueryOptions(
 
 export function createQueryServiceColumnTimeRange(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeRangeRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeRangeRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnTimeRangeResponse>>;
   },
@@ -1544,7 +1552,7 @@ export function createQueryServiceColumnTimeRange(
  */
 export function queryServiceColumnCardinality(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnCardinalityRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnCardinalityRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnCardinalityResponse> {
   return client.queryService.columnCardinality(
@@ -1555,7 +1563,7 @@ export function queryServiceColumnCardinality(
 
 export function getQueryServiceColumnCardinalityQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnCardinalityRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnCardinalityRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1567,7 +1575,7 @@ export function getQueryServiceColumnCardinalityQueryKey(
 
 export function getQueryServiceColumnCardinalityQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnCardinalityRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnCardinalityRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnCardinalityResponse>>;
   },
@@ -1588,7 +1596,7 @@ export function getQueryServiceColumnCardinalityQueryOptions(
 
 export function createQueryServiceColumnCardinality(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnCardinalityRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnCardinalityRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnCardinalityResponse>>;
   },
@@ -1607,7 +1615,7 @@ export function createQueryServiceColumnCardinality(
  */
 export function queryServiceColumnTimeSeries(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeSeriesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeSeriesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ColumnTimeSeriesResponse> {
   return client.queryService.columnTimeSeries(
@@ -1618,7 +1626,7 @@ export function queryServiceColumnTimeSeries(
 
 export function getQueryServiceColumnTimeSeriesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ColumnTimeSeriesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ColumnTimeSeriesRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1630,7 +1638,7 @@ export function getQueryServiceColumnTimeSeriesQueryKey(
 
 export function getQueryServiceColumnTimeSeriesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeSeriesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeSeriesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnTimeSeriesResponse>>;
   },
@@ -1651,7 +1659,7 @@ export function getQueryServiceColumnTimeSeriesQueryOptions(
 
 export function createQueryServiceColumnTimeSeries(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ColumnTimeSeriesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ColumnTimeSeriesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ColumnTimeSeriesResponse>>;
   },
@@ -1670,7 +1678,7 @@ export function createQueryServiceColumnTimeSeries(
  */
 export function queryServiceTableCardinality(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableCardinalityRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableCardinalityRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<TableCardinalityResponse> {
   return client.queryService.tableCardinality(
@@ -1681,7 +1689,7 @@ export function queryServiceTableCardinality(
 
 export function getQueryServiceTableCardinalityQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<TableCardinalityRequest, "instanceId">>,
+  request?: Omit<PartialMessage<TableCardinalityRequest>, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1693,7 +1701,7 @@ export function getQueryServiceTableCardinalityQueryKey(
 
 export function getQueryServiceTableCardinalityQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableCardinalityRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableCardinalityRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<TableCardinalityResponse>>;
   },
@@ -1714,7 +1722,7 @@ export function getQueryServiceTableCardinalityQueryOptions(
 
 export function createQueryServiceTableCardinality(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableCardinalityRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableCardinalityRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<TableCardinalityResponse>>;
   },
@@ -1733,7 +1741,7 @@ export function createQueryServiceTableCardinality(
  */
 export function queryServiceTableColumns(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableColumnsRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableColumnsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<TableColumnsResponse> {
   return client.queryService.tableColumns(
@@ -1744,14 +1752,14 @@ export function queryServiceTableColumns(
 
 export function getQueryServiceTableColumnsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<TableColumnsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<TableColumnsRequest>, "instanceId">,
 ): QueryKey {
   return ["QueryService", "tableColumns", instanceId, request ?? {}] as const;
 }
 
 export function getQueryServiceTableColumnsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableColumnsRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableColumnsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<TableColumnsResponse>>;
   },
@@ -1772,7 +1780,7 @@ export function getQueryServiceTableColumnsQueryOptions(
 
 export function createQueryServiceTableColumns(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableColumnsRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableColumnsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<TableColumnsResponse>>;
   },
@@ -1791,7 +1799,7 @@ export function createQueryServiceTableColumns(
  */
 export function queryServiceTableRows(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableRowsRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableRowsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<TableRowsResponse> {
   return client.queryService.tableRows(
@@ -1802,14 +1810,14 @@ export function queryServiceTableRows(
 
 export function getQueryServiceTableRowsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<TableRowsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<TableRowsRequest>, "instanceId">,
 ): QueryKey {
   return ["QueryService", "tableRows", instanceId, request ?? {}] as const;
 }
 
 export function getQueryServiceTableRowsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableRowsRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableRowsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<TableRowsResponse>>;
   },
@@ -1827,7 +1835,7 @@ export function getQueryServiceTableRowsQueryOptions(
 
 export function createQueryServiceTableRows(
   client: RuntimeClient,
-  request: PartialMessage<Omit<TableRowsRequest, "instanceId">>,
+  request: Omit<PartialMessage<TableRowsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<TableRowsResponse>>;
   },
@@ -1846,7 +1854,7 @@ export function createQueryServiceTableRows(
  */
 export function queryServiceQuery(
   client: RuntimeClient,
-  request: PartialMessage<Omit<QueryRequest, "instanceId">>,
+  request: Omit<PartialMessage<QueryRequest>, "instanceId">,
 ): Promise<QueryResponse> {
   return client.queryService.query({
     instanceId: client.instanceId,
@@ -1860,13 +1868,13 @@ export function getQueryServiceQueryMutationOptions(
     CreateMutationOptions<
       QueryResponse,
       unknown,
-      PartialMessage<Omit<QueryRequest, "instanceId">>
+      Omit<PartialMessage<QueryRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   QueryResponse,
   unknown,
-  PartialMessage<Omit<QueryRequest, "instanceId">>
+  Omit<PartialMessage<QueryRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => queryServiceQuery(client, request),
@@ -1880,14 +1888,14 @@ export function createQueryServiceQueryMutation(
     CreateMutationOptions<
       QueryResponse,
       unknown,
-      PartialMessage<Omit<QueryRequest, "instanceId">>
+      Omit<PartialMessage<QueryRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   QueryResponse,
   unknown,
-  PartialMessage<Omit<QueryRequest, "instanceId">>
+  Omit<PartialMessage<QueryRequest>, "instanceId">
 > {
   const mutationOptions = getQueryServiceQueryMutationOptions(client, options);
   return createMutation(mutationOptions, queryClient);
@@ -1898,7 +1906,7 @@ export function createQueryServiceQueryMutation(
  */
 export function queryServiceExport(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ExportRequest, "instanceId">>,
+  request: Omit<PartialMessage<ExportRequest>, "instanceId">,
 ): Promise<ExportResponse> {
   return client.queryService.export({
     instanceId: client.instanceId,
@@ -1912,13 +1920,13 @@ export function getQueryServiceExportMutationOptions(
     CreateMutationOptions<
       ExportResponse,
       unknown,
-      PartialMessage<Omit<ExportRequest, "instanceId">>
+      Omit<PartialMessage<ExportRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   ExportResponse,
   unknown,
-  PartialMessage<Omit<ExportRequest, "instanceId">>
+  Omit<PartialMessage<ExportRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => queryServiceExport(client, request),
@@ -1932,14 +1940,14 @@ export function createQueryServiceExportMutation(
     CreateMutationOptions<
       ExportResponse,
       unknown,
-      PartialMessage<Omit<ExportRequest, "instanceId">>
+      Omit<PartialMessage<ExportRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   ExportResponse,
   unknown,
-  PartialMessage<Omit<ExportRequest, "instanceId">>
+  Omit<PartialMessage<ExportRequest>, "instanceId">
 > {
   const mutationOptions = getQueryServiceExportMutationOptions(client, options);
   return createMutation(mutationOptions, queryClient);
@@ -1950,7 +1958,7 @@ export function createQueryServiceExportMutation(
  */
 export function queryServiceExportReport(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ExportReportRequest, "instanceId">>,
+  request: Omit<PartialMessage<ExportReportRequest>, "instanceId">,
 ): Promise<ExportReportResponse> {
   return client.queryService.exportReport({
     instanceId: client.instanceId,
@@ -1964,13 +1972,13 @@ export function getQueryServiceExportReportMutationOptions(
     CreateMutationOptions<
       ExportReportResponse,
       unknown,
-      PartialMessage<Omit<ExportReportRequest, "instanceId">>
+      Omit<PartialMessage<ExportReportRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   ExportReportResponse,
   unknown,
-  PartialMessage<Omit<ExportReportRequest, "instanceId">>
+  Omit<PartialMessage<ExportReportRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => queryServiceExportReport(client, request),
@@ -1984,14 +1992,14 @@ export function createQueryServiceExportReportMutation(
     CreateMutationOptions<
       ExportReportResponse,
       unknown,
-      PartialMessage<Omit<ExportReportRequest, "instanceId">>
+      Omit<PartialMessage<ExportReportRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   ExportReportResponse,
   unknown,
-  PartialMessage<Omit<ExportReportRequest, "instanceId">>
+  Omit<PartialMessage<ExportReportRequest>, "instanceId">
 > {
   const mutationOptions = getQueryServiceExportReportMutationOptions(
     client,
diff --git a/web-common/src/runtime-client/v2/gen/runtime-service.ts b/web-common/src/runtime-client/v2/gen/runtime-service.ts
index 23e1b3db961..9eec39ca3d7 100644
--- a/web-common/src/runtime-client/v2/gen/runtime-service.ts
+++ b/web-common/src/runtime-client/v2/gen/runtime-service.ts
@@ -119,25 +119,22 @@ import {
  */
 export function runtimeServicePing(
   client: RuntimeClient,
-  request: PartialMessage<Omit<PingRequest, "instanceId">>,
+  request: PartialMessage<PingRequest>,
   options?: { signal?: AbortSignal },
 ): Promise<PingResponse> {
-  return client.runtimeService.ping(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+  return client.runtimeService.ping(request, { signal: options?.signal });
 }
 
 export function getRuntimeServicePingQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<PingRequest, "instanceId">>,
+  request?: PartialMessage<PingRequest>,
 ): QueryKey {
   return ["RuntimeService", "ping", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServicePingQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<PingRequest, "instanceId">>,
+  request: PartialMessage<PingRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<PingResponse>>;
   },
@@ -155,7 +152,7 @@ export function getRuntimeServicePingQueryOptions(
 
 export function createRuntimeServicePing(
   client: RuntimeClient,
-  request: PartialMessage<Omit<PingRequest, "instanceId">>,
+  request: PartialMessage<PingRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<PingResponse>>;
   },
@@ -174,25 +171,22 @@ export function createRuntimeServicePing(
  */
 export function runtimeServiceHealth(
   client: RuntimeClient,
-  request: PartialMessage<Omit<HealthRequest, "instanceId">>,
+  request: PartialMessage<HealthRequest>,
   options?: { signal?: AbortSignal },
 ): Promise<HealthResponse> {
-  return client.runtimeService.health(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+  return client.runtimeService.health(request, { signal: options?.signal });
 }
 
 export function getRuntimeServiceHealthQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<HealthRequest, "instanceId">>,
+  request?: PartialMessage<HealthRequest>,
 ): QueryKey {
   return ["RuntimeService", "health", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceHealthQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<HealthRequest, "instanceId">>,
+  request: PartialMessage<HealthRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<HealthResponse>>;
   },
@@ -210,7 +204,7 @@ export function getRuntimeServiceHealthQueryOptions(
 
 export function createRuntimeServiceHealth(
   client: RuntimeClient,
-  request: PartialMessage<Omit<HealthRequest, "instanceId">>,
+  request: PartialMessage<HealthRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<HealthResponse>>;
   },
@@ -229,7 +223,7 @@ export function createRuntimeServiceHealth(
  */
 export function runtimeServiceInstanceHealth(
   client: RuntimeClient,
-  request: PartialMessage<Omit<InstanceHealthRequest, "instanceId">>,
+  request: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<InstanceHealthResponse> {
   return client.runtimeService.instanceHealth(
@@ -240,7 +234,7 @@ export function runtimeServiceInstanceHealth(
 
 export function getRuntimeServiceInstanceHealthQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<InstanceHealthRequest, "instanceId">>,
+  request?: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -252,7 +246,7 @@ export function getRuntimeServiceInstanceHealthQueryKey(
 
 export function getRuntimeServiceInstanceHealthQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<InstanceHealthRequest, "instanceId">>,
+  request: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<InstanceHealthResponse>>;
   },
@@ -273,7 +267,7 @@ export function getRuntimeServiceInstanceHealthQueryOptions(
 
 export function createRuntimeServiceInstanceHealth(
   client: RuntimeClient,
-  request: PartialMessage<Omit<InstanceHealthRequest, "instanceId">>,
+  request: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<InstanceHealthResponse>>;
   },
@@ -292,18 +286,17 @@ export function createRuntimeServiceInstanceHealth(
  */
 export function runtimeServiceListInstances(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListInstancesRequest, "instanceId">>,
+  request: PartialMessage<ListInstancesRequest>,
   options?: { signal?: AbortSignal },
 ): Promise<ListInstancesResponse> {
-  return client.runtimeService.listInstances(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+  return client.runtimeService.listInstances(request, {
+    signal: options?.signal,
+  });
 }
 
 export function getRuntimeServiceListInstancesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListInstancesRequest, "instanceId">>,
+  request?: PartialMessage<ListInstancesRequest>,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -315,7 +308,7 @@ export function getRuntimeServiceListInstancesQueryKey(
 
 export function getRuntimeServiceListInstancesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListInstancesRequest, "instanceId">>,
+  request: PartialMessage<ListInstancesRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<ListInstancesResponse>>;
   },
@@ -336,7 +329,7 @@ export function getRuntimeServiceListInstancesQueryOptions(
 
 export function createRuntimeServiceListInstances(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListInstancesRequest, "instanceId">>,
+  request: PartialMessage<ListInstancesRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<ListInstancesResponse>>;
   },
@@ -355,7 +348,7 @@ export function createRuntimeServiceListInstances(
  */
 export function runtimeServiceGetInstance(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetInstanceRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<GetInstanceResponse> {
   return client.runtimeService.getInstance(
@@ -366,14 +359,14 @@ export function runtimeServiceGetInstance(
 
 export function getRuntimeServiceGetInstanceQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<GetInstanceRequest, "instanceId">>,
+  request?: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
 ): QueryKey {
   return ["RuntimeService", "getInstance", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceGetInstanceQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetInstanceRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetInstanceResponse>>;
   },
@@ -394,7 +387,7 @@ export function getRuntimeServiceGetInstanceQueryOptions(
 
 export function createRuntimeServiceGetInstance(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetInstanceRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetInstanceResponse>>;
   },
@@ -413,7 +406,7 @@ export function createRuntimeServiceGetInstance(
  */
 export function runtimeServiceListFiles(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListFilesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListFilesResponse> {
   return client.runtimeService.listFiles(
@@ -424,14 +417,14 @@ export function runtimeServiceListFiles(
 
 export function getRuntimeServiceListFilesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListFilesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
 ): QueryKey {
   return ["RuntimeService", "listFiles", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceListFilesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListFilesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListFilesResponse>>;
   },
@@ -452,7 +445,7 @@ export function getRuntimeServiceListFilesQueryOptions(
 
 export function createRuntimeServiceListFiles(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListFilesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListFilesResponse>>;
   },
@@ -471,7 +464,7 @@ export function createRuntimeServiceListFiles(
  */
 export function runtimeServiceGetFile(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetFileRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetFileRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<GetFileResponse> {
   return client.runtimeService.getFile(
@@ -482,14 +475,14 @@ export function runtimeServiceGetFile(
 
 export function getRuntimeServiceGetFileQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<GetFileRequest, "instanceId">>,
+  request?: Omit<PartialMessage<GetFileRequest>, "instanceId">,
 ): QueryKey {
   return ["RuntimeService", "getFile", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceGetFileQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetFileRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetFileRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetFileResponse>>;
   },
@@ -507,7 +500,7 @@ export function getRuntimeServiceGetFileQueryOptions(
 
 export function createRuntimeServiceGetFile(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetFileRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetFileRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetFileResponse>>;
   },
@@ -526,25 +519,24 @@ export function createRuntimeServiceGetFile(
  */
 export function runtimeServiceListExamples(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListExamplesRequest, "instanceId">>,
+  request: PartialMessage<ListExamplesRequest>,
   options?: { signal?: AbortSignal },
 ): Promise<ListExamplesResponse> {
-  return client.runtimeService.listExamples(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+  return client.runtimeService.listExamples(request, {
+    signal: options?.signal,
+  });
 }
 
 export function getRuntimeServiceListExamplesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListExamplesRequest, "instanceId">>,
+  request?: PartialMessage<ListExamplesRequest>,
 ): QueryKey {
   return ["RuntimeService", "listExamples", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceListExamplesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListExamplesRequest, "instanceId">>,
+  request: PartialMessage<ListExamplesRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<ListExamplesResponse>>;
   },
@@ -565,7 +557,7 @@ export function getRuntimeServiceListExamplesQueryOptions(
 
 export function createRuntimeServiceListExamples(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListExamplesRequest, "instanceId">>,
+  request: PartialMessage<ListExamplesRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<ListExamplesResponse>>;
   },
@@ -584,7 +576,7 @@ export function createRuntimeServiceListExamples(
  */
 export function runtimeServiceQueryResolver(
   client: RuntimeClient,
-  request: PartialMessage<Omit<QueryResolverRequest, "instanceId">>,
+  request: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<QueryResolverResponse> {
   return client.runtimeService.queryResolver(
@@ -595,7 +587,7 @@ export function runtimeServiceQueryResolver(
 
 export function getRuntimeServiceQueryResolverQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<QueryResolverRequest, "instanceId">>,
+  request?: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -607,7 +599,7 @@ export function getRuntimeServiceQueryResolverQueryKey(
 
 export function getRuntimeServiceQueryResolverQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<QueryResolverRequest, "instanceId">>,
+  request: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<QueryResolverResponse>>;
   },
@@ -628,7 +620,7 @@ export function getRuntimeServiceQueryResolverQueryOptions(
 
 export function createRuntimeServiceQueryResolver(
   client: RuntimeClient,
-  request: PartialMessage<Omit<QueryResolverRequest, "instanceId">>,
+  request: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<QueryResolverResponse>>;
   },
@@ -647,7 +639,7 @@ export function createRuntimeServiceQueryResolver(
  */
 export function runtimeServiceGetLogs(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetLogsRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<GetLogsResponse> {
   return client.runtimeService.getLogs(
@@ -658,14 +650,14 @@ export function runtimeServiceGetLogs(
 
 export function getRuntimeServiceGetLogsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<GetLogsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
 ): QueryKey {
   return ["RuntimeService", "getLogs", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceGetLogsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetLogsRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetLogsResponse>>;
   },
@@ -683,7 +675,7 @@ export function getRuntimeServiceGetLogsQueryOptions(
 
 export function createRuntimeServiceGetLogs(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetLogsRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetLogsResponse>>;
   },
@@ -702,7 +694,7 @@ export function createRuntimeServiceGetLogs(
  */
 export function runtimeServiceListResources(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListResourcesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListResourcesResponse> {
   return client.runtimeService.listResources(
@@ -713,7 +705,7 @@ export function runtimeServiceListResources(
 
 export function getRuntimeServiceListResourcesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListResourcesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -725,7 +717,7 @@ export function getRuntimeServiceListResourcesQueryKey(
 
 export function getRuntimeServiceListResourcesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListResourcesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListResourcesResponse>>;
   },
@@ -746,7 +738,7 @@ export function getRuntimeServiceListResourcesQueryOptions(
 
 export function createRuntimeServiceListResources(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListResourcesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListResourcesResponse>>;
   },
@@ -765,7 +757,7 @@ export function createRuntimeServiceListResources(
  */
 export function runtimeServiceGetResource(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetResourceRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<GetResourceResponse> {
   return client.runtimeService.getResource(
@@ -776,14 +768,14 @@ export function runtimeServiceGetResource(
 
 export function getRuntimeServiceGetResourceQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<GetResourceRequest, "instanceId">>,
+  request?: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
 ): QueryKey {
   return ["RuntimeService", "getResource", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceGetResourceQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetResourceRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetResourceResponse>>;
   },
@@ -804,7 +796,7 @@ export function getRuntimeServiceGetResourceQueryOptions(
 
 export function createRuntimeServiceGetResource(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetResourceRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetResourceResponse>>;
   },
@@ -823,7 +815,7 @@ export function createRuntimeServiceGetResource(
  */
 export function runtimeServiceGetExplore(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetExploreRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<GetExploreResponse> {
   return client.runtimeService.getExplore(
@@ -834,14 +826,14 @@ export function runtimeServiceGetExplore(
 
 export function getRuntimeServiceGetExploreQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<GetExploreRequest, "instanceId">>,
+  request?: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
 ): QueryKey {
   return ["RuntimeService", "getExplore", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceGetExploreQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetExploreRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetExploreResponse>>;
   },
@@ -862,7 +854,7 @@ export function getRuntimeServiceGetExploreQueryOptions(
 
 export function createRuntimeServiceGetExplore(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetExploreRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetExploreResponse>>;
   },
@@ -881,7 +873,7 @@ export function createRuntimeServiceGetExplore(
  */
 export function runtimeServiceGetModelPartitions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetModelPartitionsRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<GetModelPartitionsResponse> {
   return client.runtimeService.getModelPartitions(
@@ -892,7 +884,7 @@ export function runtimeServiceGetModelPartitions(
 
 export function getRuntimeServiceGetModelPartitionsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<GetModelPartitionsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -904,7 +896,7 @@ export function getRuntimeServiceGetModelPartitionsQueryKey(
 
 export function getRuntimeServiceGetModelPartitionsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetModelPartitionsRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetModelPartitionsResponse>>;
   },
@@ -925,7 +917,7 @@ export function getRuntimeServiceGetModelPartitionsQueryOptions(
 
 export function createRuntimeServiceGetModelPartitions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetModelPartitionsRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetModelPartitionsResponse>>;
   },
@@ -944,18 +936,17 @@ export function createRuntimeServiceGetModelPartitions(
  */
 export function runtimeServiceListConnectorDrivers(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListConnectorDriversRequest, "instanceId">>,
+  request: PartialMessage<ListConnectorDriversRequest>,
   options?: { signal?: AbortSignal },
 ): Promise<ListConnectorDriversResponse> {
-  return client.runtimeService.listConnectorDrivers(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+  return client.runtimeService.listConnectorDrivers(request, {
+    signal: options?.signal,
+  });
 }
 
 export function getRuntimeServiceListConnectorDriversQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListConnectorDriversRequest, "instanceId">>,
+  request?: PartialMessage<ListConnectorDriversRequest>,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -967,7 +958,7 @@ export function getRuntimeServiceListConnectorDriversQueryKey(
 
 export function getRuntimeServiceListConnectorDriversQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListConnectorDriversRequest, "instanceId">>,
+  request: PartialMessage<ListConnectorDriversRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<ListConnectorDriversResponse>>;
   },
@@ -988,7 +979,7 @@ export function getRuntimeServiceListConnectorDriversQueryOptions(
 
 export function createRuntimeServiceListConnectorDrivers(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListConnectorDriversRequest, "instanceId">>,
+  request: PartialMessage<ListConnectorDriversRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<ListConnectorDriversResponse>>;
   },
@@ -1007,7 +998,7 @@ export function createRuntimeServiceListConnectorDrivers(
  */
 export function runtimeServiceAnalyzeConnectors(
   client: RuntimeClient,
-  request: PartialMessage<Omit<AnalyzeConnectorsRequest, "instanceId">>,
+  request: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<AnalyzeConnectorsResponse> {
   return client.runtimeService.analyzeConnectors(
@@ -1018,7 +1009,7 @@ export function runtimeServiceAnalyzeConnectors(
 
 export function getRuntimeServiceAnalyzeConnectorsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<AnalyzeConnectorsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -1030,7 +1021,7 @@ export function getRuntimeServiceAnalyzeConnectorsQueryKey(
 
 export function getRuntimeServiceAnalyzeConnectorsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<AnalyzeConnectorsRequest, "instanceId">>,
+  request: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<AnalyzeConnectorsResponse>>;
   },
@@ -1051,7 +1042,7 @@ export function getRuntimeServiceAnalyzeConnectorsQueryOptions(
 
 export function createRuntimeServiceAnalyzeConnectors(
   client: RuntimeClient,
-  request: PartialMessage<Omit<AnalyzeConnectorsRequest, "instanceId">>,
+  request: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<AnalyzeConnectorsResponse>>;
   },
@@ -1070,7 +1061,7 @@ export function createRuntimeServiceAnalyzeConnectors(
  */
 export function runtimeServiceListNotifierConnectors(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListNotifierConnectorsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListNotifierConnectorsResponse> {
   return client.runtimeService.listNotifierConnectors(
@@ -1081,7 +1072,7 @@ export function runtimeServiceListNotifierConnectors(
 
 export function getRuntimeServiceListNotifierConnectorsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListNotifierConnectorsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -1093,7 +1084,7 @@ export function getRuntimeServiceListNotifierConnectorsQueryKey(
 
 export function getRuntimeServiceListNotifierConnectorsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListNotifierConnectorsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListNotifierConnectorsResponse>>;
   },
@@ -1114,7 +1105,7 @@ export function getRuntimeServiceListNotifierConnectorsQueryOptions(
 
 export function createRuntimeServiceListNotifierConnectors(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListNotifierConnectorsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListNotifierConnectorsResponse>>;
   },
@@ -1133,7 +1124,7 @@ export function createRuntimeServiceListNotifierConnectors(
  */
 export function runtimeServiceListConversations(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListConversationsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListConversationsResponse> {
   return client.runtimeService.listConversations(
@@ -1144,7 +1135,7 @@ export function runtimeServiceListConversations(
 
 export function getRuntimeServiceListConversationsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListConversationsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -1156,7 +1147,7 @@ export function getRuntimeServiceListConversationsQueryKey(
 
 export function getRuntimeServiceListConversationsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListConversationsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListConversationsResponse>>;
   },
@@ -1177,7 +1168,7 @@ export function getRuntimeServiceListConversationsQueryOptions(
 
 export function createRuntimeServiceListConversations(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListConversationsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListConversationsResponse>>;
   },
@@ -1196,7 +1187,7 @@ export function createRuntimeServiceListConversations(
  */
 export function runtimeServiceGetConversation(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetConversationRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<GetConversationResponse> {
   return client.runtimeService.getConversation(
@@ -1207,7 +1198,7 @@ export function runtimeServiceGetConversation(
 
 export function getRuntimeServiceGetConversationQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<GetConversationRequest, "instanceId">>,
+  request?: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -1219,7 +1210,7 @@ export function getRuntimeServiceGetConversationQueryKey(
 
 export function getRuntimeServiceGetConversationQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetConversationRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetConversationResponse>>;
   },
@@ -1240,7 +1231,7 @@ export function getRuntimeServiceGetConversationQueryOptions(
 
 export function createRuntimeServiceGetConversation(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GetConversationRequest, "instanceId">>,
+  request: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<GetConversationResponse>>;
   },
@@ -1259,7 +1250,7 @@ export function createRuntimeServiceGetConversation(
  */
 export function runtimeServiceListTools(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListToolsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListToolsResponse> {
   return client.runtimeService.listTools(
@@ -1270,14 +1261,14 @@ export function runtimeServiceListTools(
 
 export function getRuntimeServiceListToolsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListToolsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
 ): QueryKey {
   return ["RuntimeService", "listTools", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceListToolsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListToolsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListToolsResponse>>;
   },
@@ -1298,7 +1289,7 @@ export function getRuntimeServiceListToolsQueryOptions(
 
 export function createRuntimeServiceListTools(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListToolsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListToolsResponse>>;
   },
@@ -1317,25 +1308,24 @@ export function createRuntimeServiceListTools(
  */
 export function runtimeServiceIssueDevJWT(
   client: RuntimeClient,
-  request: PartialMessage<Omit<IssueDevJWTRequest, "instanceId">>,
+  request: PartialMessage<IssueDevJWTRequest>,
   options?: { signal?: AbortSignal },
 ): Promise<IssueDevJWTResponse> {
-  return client.runtimeService.issueDevJWT(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+  return client.runtimeService.issueDevJWT(request, {
+    signal: options?.signal,
+  });
 }
 
 export function getRuntimeServiceIssueDevJWTQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<IssueDevJWTRequest, "instanceId">>,
+  request?: PartialMessage<IssueDevJWTRequest>,
 ): QueryKey {
   return ["RuntimeService", "issueDevJWT", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceIssueDevJWTQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<IssueDevJWTRequest, "instanceId">>,
+  request: PartialMessage<IssueDevJWTRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<IssueDevJWTResponse>>;
   },
@@ -1356,7 +1346,7 @@ export function getRuntimeServiceIssueDevJWTQueryOptions(
 
 export function createRuntimeServiceIssueDevJWT(
   client: RuntimeClient,
-  request: PartialMessage<Omit<IssueDevJWTRequest, "instanceId">>,
+  request: PartialMessage<IssueDevJWTRequest>,
   options?: {
     query?: Partial<CreateQueryOptions<IssueDevJWTResponse>>;
   },
@@ -1375,7 +1365,7 @@ export function createRuntimeServiceIssueDevJWT(
  */
 export function runtimeServiceAnalyzeVariables(
   client: RuntimeClient,
-  request: PartialMessage<Omit<AnalyzeVariablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<AnalyzeVariablesResponse> {
   return client.runtimeService.analyzeVariables(
@@ -1386,7 +1376,7 @@ export function runtimeServiceAnalyzeVariables(
 
 export function getRuntimeServiceAnalyzeVariablesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<AnalyzeVariablesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -1398,7 +1388,7 @@ export function getRuntimeServiceAnalyzeVariablesQueryKey(
 
 export function getRuntimeServiceAnalyzeVariablesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<AnalyzeVariablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<AnalyzeVariablesResponse>>;
   },
@@ -1419,7 +1409,7 @@ export function getRuntimeServiceAnalyzeVariablesQueryOptions(
 
 export function createRuntimeServiceAnalyzeVariables(
   client: RuntimeClient,
-  request: PartialMessage<Omit<AnalyzeVariablesRequest, "instanceId">>,
+  request: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<AnalyzeVariablesResponse>>;
   },
@@ -1438,7 +1428,7 @@ export function createRuntimeServiceAnalyzeVariables(
  */
 export function runtimeServiceListGitCommits(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListGitCommitsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListGitCommitsResponse> {
   return client.runtimeService.listGitCommits(
@@ -1449,7 +1439,7 @@ export function runtimeServiceListGitCommits(
 
 export function getRuntimeServiceListGitCommitsQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListGitCommitsRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -1461,7 +1451,7 @@ export function getRuntimeServiceListGitCommitsQueryKey(
 
 export function getRuntimeServiceListGitCommitsQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListGitCommitsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListGitCommitsResponse>>;
   },
@@ -1482,7 +1472,7 @@ export function getRuntimeServiceListGitCommitsQueryOptions(
 
 export function createRuntimeServiceListGitCommits(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListGitCommitsRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListGitCommitsResponse>>;
   },
@@ -1501,7 +1491,7 @@ export function createRuntimeServiceListGitCommits(
  */
 export function runtimeServiceListGitBranches(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListGitBranchesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
 ): Promise<ListGitBranchesResponse> {
   return client.runtimeService.listGitBranches(
@@ -1512,7 +1502,7 @@ export function runtimeServiceListGitBranches(
 
 export function getRuntimeServiceListGitBranchesQueryKey(
   instanceId: string,
-  request?: PartialMessage<Omit<ListGitBranchesRequest, "instanceId">>,
+  request?: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
 ): QueryKey {
   return [
     "RuntimeService",
@@ -1524,7 +1514,7 @@ export function getRuntimeServiceListGitBranchesQueryKey(
 
 export function getRuntimeServiceListGitBranchesQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListGitBranchesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListGitBranchesResponse>>;
   },
@@ -1545,7 +1535,7 @@ export function getRuntimeServiceListGitBranchesQueryOptions(
 
 export function createRuntimeServiceListGitBranches(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ListGitBranchesRequest, "instanceId">>,
+  request: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
   options?: {
     query?: Partial<CreateQueryOptions<ListGitBranchesResponse>>;
   },
@@ -1564,7 +1554,7 @@ export function createRuntimeServiceListGitBranches(
  */
 export function runtimeServiceCreateInstance(
   client: RuntimeClient,
-  request: PartialMessage<Omit<CreateInstanceRequest, "instanceId">>,
+  request: Omit<PartialMessage<CreateInstanceRequest>, "instanceId">,
 ): Promise<CreateInstanceResponse> {
   return client.runtimeService.createInstance({
     instanceId: client.instanceId,
@@ -1578,13 +1568,13 @@ export function getRuntimeServiceCreateInstanceMutationOptions(
     CreateMutationOptions<
       CreateInstanceResponse,
       unknown,
-      PartialMessage<Omit<CreateInstanceRequest, "instanceId">>
+      Omit<PartialMessage<CreateInstanceRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   CreateInstanceResponse,
   unknown,
-  PartialMessage<Omit<CreateInstanceRequest, "instanceId">>
+  Omit<PartialMessage<CreateInstanceRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceCreateInstance(client, request),
@@ -1598,14 +1588,14 @@ export function createRuntimeServiceCreateInstanceMutation(
     CreateMutationOptions<
       CreateInstanceResponse,
       unknown,
-      PartialMessage<Omit<CreateInstanceRequest, "instanceId">>
+      Omit<PartialMessage<CreateInstanceRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   CreateInstanceResponse,
   unknown,
-  PartialMessage<Omit<CreateInstanceRequest, "instanceId">>
+  Omit<PartialMessage<CreateInstanceRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceCreateInstanceMutationOptions(
     client,
@@ -1619,7 +1609,7 @@ export function createRuntimeServiceCreateInstanceMutation(
  */
 export function runtimeServiceEditInstance(
   client: RuntimeClient,
-  request: PartialMessage<Omit<EditInstanceRequest, "instanceId">>,
+  request: Omit<PartialMessage<EditInstanceRequest>, "instanceId">,
 ): Promise<EditInstanceResponse> {
   return client.runtimeService.editInstance({
     instanceId: client.instanceId,
@@ -1633,13 +1623,13 @@ export function getRuntimeServiceEditInstanceMutationOptions(
     CreateMutationOptions<
       EditInstanceResponse,
       unknown,
-      PartialMessage<Omit<EditInstanceRequest, "instanceId">>
+      Omit<PartialMessage<EditInstanceRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   EditInstanceResponse,
   unknown,
-  PartialMessage<Omit<EditInstanceRequest, "instanceId">>
+  Omit<PartialMessage<EditInstanceRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceEditInstance(client, request),
@@ -1653,14 +1643,14 @@ export function createRuntimeServiceEditInstanceMutation(
     CreateMutationOptions<
       EditInstanceResponse,
       unknown,
-      PartialMessage<Omit<EditInstanceRequest, "instanceId">>
+      Omit<PartialMessage<EditInstanceRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   EditInstanceResponse,
   unknown,
-  PartialMessage<Omit<EditInstanceRequest, "instanceId">>
+  Omit<PartialMessage<EditInstanceRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceEditInstanceMutationOptions(
     client,
@@ -1674,7 +1664,7 @@ export function createRuntimeServiceEditInstanceMutation(
  */
 export function runtimeServiceDeleteInstance(
   client: RuntimeClient,
-  request: PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>,
+  request: Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">,
 ): Promise<DeleteInstanceResponse> {
   return client.runtimeService.deleteInstance({
     instanceId: client.instanceId,
@@ -1688,13 +1678,13 @@ export function getRuntimeServiceDeleteInstanceMutationOptions(
     CreateMutationOptions<
       DeleteInstanceResponse,
       unknown,
-      PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>
+      Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   DeleteInstanceResponse,
   unknown,
-  PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>
+  Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceDeleteInstance(client, request),
@@ -1708,14 +1698,14 @@ export function createRuntimeServiceDeleteInstanceMutation(
     CreateMutationOptions<
       DeleteInstanceResponse,
       unknown,
-      PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>
+      Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   DeleteInstanceResponse,
   unknown,
-  PartialMessage<Omit<DeleteInstanceRequest, "instanceId">>
+  Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceDeleteInstanceMutationOptions(
     client,
@@ -1729,7 +1719,7 @@ export function createRuntimeServiceDeleteInstanceMutation(
  */
 export function runtimeServiceReloadConfig(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ReloadConfigRequest, "instanceId">>,
+  request: Omit<PartialMessage<ReloadConfigRequest>, "instanceId">,
 ): Promise<ReloadConfigResponse> {
   return client.runtimeService.reloadConfig({
     instanceId: client.instanceId,
@@ -1743,13 +1733,13 @@ export function getRuntimeServiceReloadConfigMutationOptions(
     CreateMutationOptions<
       ReloadConfigResponse,
       unknown,
-      PartialMessage<Omit<ReloadConfigRequest, "instanceId">>
+      Omit<PartialMessage<ReloadConfigRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   ReloadConfigResponse,
   unknown,
-  PartialMessage<Omit<ReloadConfigRequest, "instanceId">>
+  Omit<PartialMessage<ReloadConfigRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceReloadConfig(client, request),
@@ -1763,14 +1753,14 @@ export function createRuntimeServiceReloadConfigMutation(
     CreateMutationOptions<
       ReloadConfigResponse,
       unknown,
-      PartialMessage<Omit<ReloadConfigRequest, "instanceId">>
+      Omit<PartialMessage<ReloadConfigRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   ReloadConfigResponse,
   unknown,
-  PartialMessage<Omit<ReloadConfigRequest, "instanceId">>
+  Omit<PartialMessage<ReloadConfigRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceReloadConfigMutationOptions(
     client,
@@ -1784,7 +1774,7 @@ export function createRuntimeServiceReloadConfigMutation(
  */
 export function runtimeServicePutFile(
   client: RuntimeClient,
-  request: PartialMessage<Omit<PutFileRequest, "instanceId">>,
+  request: Omit<PartialMessage<PutFileRequest>, "instanceId">,
 ): Promise<PutFileResponse> {
   return client.runtimeService.putFile({
     instanceId: client.instanceId,
@@ -1798,13 +1788,13 @@ export function getRuntimeServicePutFileMutationOptions(
     CreateMutationOptions<
       PutFileResponse,
       unknown,
-      PartialMessage<Omit<PutFileRequest, "instanceId">>
+      Omit<PartialMessage<PutFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   PutFileResponse,
   unknown,
-  PartialMessage<Omit<PutFileRequest, "instanceId">>
+  Omit<PartialMessage<PutFileRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServicePutFile(client, request),
@@ -1818,14 +1808,14 @@ export function createRuntimeServicePutFileMutation(
     CreateMutationOptions<
       PutFileResponse,
       unknown,
-      PartialMessage<Omit<PutFileRequest, "instanceId">>
+      Omit<PartialMessage<PutFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   PutFileResponse,
   unknown,
-  PartialMessage<Omit<PutFileRequest, "instanceId">>
+  Omit<PartialMessage<PutFileRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServicePutFileMutationOptions(
     client,
@@ -1839,7 +1829,7 @@ export function createRuntimeServicePutFileMutation(
  */
 export function runtimeServiceCreateDirectory(
   client: RuntimeClient,
-  request: PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>,
+  request: Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">,
 ): Promise<CreateDirectoryResponse> {
   return client.runtimeService.createDirectory({
     instanceId: client.instanceId,
@@ -1853,13 +1843,13 @@ export function getRuntimeServiceCreateDirectoryMutationOptions(
     CreateMutationOptions<
       CreateDirectoryResponse,
       unknown,
-      PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>
+      Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   CreateDirectoryResponse,
   unknown,
-  PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>
+  Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceCreateDirectory(client, request),
@@ -1873,14 +1863,14 @@ export function createRuntimeServiceCreateDirectoryMutation(
     CreateMutationOptions<
       CreateDirectoryResponse,
       unknown,
-      PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>
+      Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   CreateDirectoryResponse,
   unknown,
-  PartialMessage<Omit<CreateDirectoryRequest, "instanceId">>
+  Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceCreateDirectoryMutationOptions(
     client,
@@ -1894,7 +1884,7 @@ export function createRuntimeServiceCreateDirectoryMutation(
  */
 export function runtimeServiceDeleteFile(
   client: RuntimeClient,
-  request: PartialMessage<Omit<DeleteFileRequest, "instanceId">>,
+  request: Omit<PartialMessage<DeleteFileRequest>, "instanceId">,
 ): Promise<DeleteFileResponse> {
   return client.runtimeService.deleteFile({
     instanceId: client.instanceId,
@@ -1908,13 +1898,13 @@ export function getRuntimeServiceDeleteFileMutationOptions(
     CreateMutationOptions<
       DeleteFileResponse,
       unknown,
-      PartialMessage<Omit<DeleteFileRequest, "instanceId">>
+      Omit<PartialMessage<DeleteFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   DeleteFileResponse,
   unknown,
-  PartialMessage<Omit<DeleteFileRequest, "instanceId">>
+  Omit<PartialMessage<DeleteFileRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceDeleteFile(client, request),
@@ -1928,14 +1918,14 @@ export function createRuntimeServiceDeleteFileMutation(
     CreateMutationOptions<
       DeleteFileResponse,
       unknown,
-      PartialMessage<Omit<DeleteFileRequest, "instanceId">>
+      Omit<PartialMessage<DeleteFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   DeleteFileResponse,
   unknown,
-  PartialMessage<Omit<DeleteFileRequest, "instanceId">>
+  Omit<PartialMessage<DeleteFileRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceDeleteFileMutationOptions(
     client,
@@ -1949,7 +1939,7 @@ export function createRuntimeServiceDeleteFileMutation(
  */
 export function runtimeServiceRenameFile(
   client: RuntimeClient,
-  request: PartialMessage<Omit<RenameFileRequest, "instanceId">>,
+  request: Omit<PartialMessage<RenameFileRequest>, "instanceId">,
 ): Promise<RenameFileResponse> {
   return client.runtimeService.renameFile({
     instanceId: client.instanceId,
@@ -1963,13 +1953,13 @@ export function getRuntimeServiceRenameFileMutationOptions(
     CreateMutationOptions<
       RenameFileResponse,
       unknown,
-      PartialMessage<Omit<RenameFileRequest, "instanceId">>
+      Omit<PartialMessage<RenameFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   RenameFileResponse,
   unknown,
-  PartialMessage<Omit<RenameFileRequest, "instanceId">>
+  Omit<PartialMessage<RenameFileRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceRenameFile(client, request),
@@ -1983,14 +1973,14 @@ export function createRuntimeServiceRenameFileMutation(
     CreateMutationOptions<
       RenameFileResponse,
       unknown,
-      PartialMessage<Omit<RenameFileRequest, "instanceId">>
+      Omit<PartialMessage<RenameFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   RenameFileResponse,
   unknown,
-  PartialMessage<Omit<RenameFileRequest, "instanceId">>
+  Omit<PartialMessage<RenameFileRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceRenameFileMutationOptions(
     client,
@@ -2004,7 +1994,7 @@ export function createRuntimeServiceRenameFileMutation(
  */
 export function runtimeServiceUnpackExample(
   client: RuntimeClient,
-  request: PartialMessage<Omit<UnpackExampleRequest, "instanceId">>,
+  request: Omit<PartialMessage<UnpackExampleRequest>, "instanceId">,
 ): Promise<UnpackExampleResponse> {
   return client.runtimeService.unpackExample({
     instanceId: client.instanceId,
@@ -2018,13 +2008,13 @@ export function getRuntimeServiceUnpackExampleMutationOptions(
     CreateMutationOptions<
       UnpackExampleResponse,
       unknown,
-      PartialMessage<Omit<UnpackExampleRequest, "instanceId">>
+      Omit<PartialMessage<UnpackExampleRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   UnpackExampleResponse,
   unknown,
-  PartialMessage<Omit<UnpackExampleRequest, "instanceId">>
+  Omit<PartialMessage<UnpackExampleRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceUnpackExample(client, request),
@@ -2038,14 +2028,14 @@ export function createRuntimeServiceUnpackExampleMutation(
     CreateMutationOptions<
       UnpackExampleResponse,
       unknown,
-      PartialMessage<Omit<UnpackExampleRequest, "instanceId">>
+      Omit<PartialMessage<UnpackExampleRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   UnpackExampleResponse,
   unknown,
-  PartialMessage<Omit<UnpackExampleRequest, "instanceId">>
+  Omit<PartialMessage<UnpackExampleRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceUnpackExampleMutationOptions(
     client,
@@ -2059,7 +2049,7 @@ export function createRuntimeServiceUnpackExampleMutation(
  */
 export function runtimeServiceUnpackEmpty(
   client: RuntimeClient,
-  request: PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>,
+  request: Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">,
 ): Promise<UnpackEmptyResponse> {
   return client.runtimeService.unpackEmpty({
     instanceId: client.instanceId,
@@ -2073,13 +2063,13 @@ export function getRuntimeServiceUnpackEmptyMutationOptions(
     CreateMutationOptions<
       UnpackEmptyResponse,
       unknown,
-      PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>
+      Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   UnpackEmptyResponse,
   unknown,
-  PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>
+  Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceUnpackEmpty(client, request),
@@ -2093,14 +2083,14 @@ export function createRuntimeServiceUnpackEmptyMutation(
     CreateMutationOptions<
       UnpackEmptyResponse,
       unknown,
-      PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>
+      Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   UnpackEmptyResponse,
   unknown,
-  PartialMessage<Omit<UnpackEmptyRequest, "instanceId">>
+  Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceUnpackEmptyMutationOptions(
     client,
@@ -2114,7 +2104,7 @@ export function createRuntimeServiceUnpackEmptyMutation(
  */
 export function runtimeServiceGenerateMetricsViewFile(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>,
+  request: Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">,
 ): Promise<GenerateMetricsViewFileResponse> {
   return client.runtimeService.generateMetricsViewFile({
     instanceId: client.instanceId,
@@ -2128,13 +2118,13 @@ export function getRuntimeServiceGenerateMetricsViewFileMutationOptions(
     CreateMutationOptions<
       GenerateMetricsViewFileResponse,
       unknown,
-      PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>
+      Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GenerateMetricsViewFileResponse,
   unknown,
-  PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>
+  Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) =>
@@ -2149,14 +2139,14 @@ export function createRuntimeServiceGenerateMetricsViewFileMutation(
     CreateMutationOptions<
       GenerateMetricsViewFileResponse,
       unknown,
-      PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>
+      Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GenerateMetricsViewFileResponse,
   unknown,
-  PartialMessage<Omit<GenerateMetricsViewFileRequest, "instanceId">>
+  Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">
 > {
   const mutationOptions =
     getRuntimeServiceGenerateMetricsViewFileMutationOptions(client, options);
@@ -2168,7 +2158,7 @@ export function createRuntimeServiceGenerateMetricsViewFileMutation(
  */
 export function runtimeServiceGenerateCanvasFile(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>,
+  request: Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">,
 ): Promise<GenerateCanvasFileResponse> {
   return client.runtimeService.generateCanvasFile({
     instanceId: client.instanceId,
@@ -2182,13 +2172,13 @@ export function getRuntimeServiceGenerateCanvasFileMutationOptions(
     CreateMutationOptions<
       GenerateCanvasFileResponse,
       unknown,
-      PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>
+      Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GenerateCanvasFileResponse,
   unknown,
-  PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>
+  Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGenerateCanvasFile(client, request),
@@ -2202,14 +2192,14 @@ export function createRuntimeServiceGenerateCanvasFileMutation(
     CreateMutationOptions<
       GenerateCanvasFileResponse,
       unknown,
-      PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>
+      Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GenerateCanvasFileResponse,
   unknown,
-  PartialMessage<Omit<GenerateCanvasFileRequest, "instanceId">>
+  Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGenerateCanvasFileMutationOptions(
     client,
@@ -2223,7 +2213,7 @@ export function createRuntimeServiceGenerateCanvasFileMutation(
  */
 export function runtimeServiceGenerateResolver(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GenerateResolverRequest, "instanceId">>,
+  request: Omit<PartialMessage<GenerateResolverRequest>, "instanceId">,
 ): Promise<GenerateResolverResponse> {
   return client.runtimeService.generateResolver({
     instanceId: client.instanceId,
@@ -2237,13 +2227,13 @@ export function getRuntimeServiceGenerateResolverMutationOptions(
     CreateMutationOptions<
       GenerateResolverResponse,
       unknown,
-      PartialMessage<Omit<GenerateResolverRequest, "instanceId">>
+      Omit<PartialMessage<GenerateResolverRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GenerateResolverResponse,
   unknown,
-  PartialMessage<Omit<GenerateResolverRequest, "instanceId">>
+  Omit<PartialMessage<GenerateResolverRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGenerateResolver(client, request),
@@ -2257,14 +2247,14 @@ export function createRuntimeServiceGenerateResolverMutation(
     CreateMutationOptions<
       GenerateResolverResponse,
       unknown,
-      PartialMessage<Omit<GenerateResolverRequest, "instanceId">>
+      Omit<PartialMessage<GenerateResolverRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GenerateResolverResponse,
   unknown,
-  PartialMessage<Omit<GenerateResolverRequest, "instanceId">>
+  Omit<PartialMessage<GenerateResolverRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGenerateResolverMutationOptions(
     client,
@@ -2278,7 +2268,7 @@ export function createRuntimeServiceGenerateResolverMutation(
  */
 export function runtimeServiceGenerateRenderer(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GenerateRendererRequest, "instanceId">>,
+  request: Omit<PartialMessage<GenerateRendererRequest>, "instanceId">,
 ): Promise<GenerateRendererResponse> {
   return client.runtimeService.generateRenderer({
     instanceId: client.instanceId,
@@ -2292,13 +2282,13 @@ export function getRuntimeServiceGenerateRendererMutationOptions(
     CreateMutationOptions<
       GenerateRendererResponse,
       unknown,
-      PartialMessage<Omit<GenerateRendererRequest, "instanceId">>
+      Omit<PartialMessage<GenerateRendererRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GenerateRendererResponse,
   unknown,
-  PartialMessage<Omit<GenerateRendererRequest, "instanceId">>
+  Omit<PartialMessage<GenerateRendererRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGenerateRenderer(client, request),
@@ -2312,14 +2302,14 @@ export function createRuntimeServiceGenerateRendererMutation(
     CreateMutationOptions<
       GenerateRendererResponse,
       unknown,
-      PartialMessage<Omit<GenerateRendererRequest, "instanceId">>
+      Omit<PartialMessage<GenerateRendererRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GenerateRendererResponse,
   unknown,
-  PartialMessage<Omit<GenerateRendererRequest, "instanceId">>
+  Omit<PartialMessage<GenerateRendererRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGenerateRendererMutationOptions(
     client,
@@ -2333,7 +2323,7 @@ export function createRuntimeServiceGenerateRendererMutation(
  */
 export function runtimeServiceCreateTrigger(
   client: RuntimeClient,
-  request: PartialMessage<Omit<CreateTriggerRequest, "instanceId">>,
+  request: Omit<PartialMessage<CreateTriggerRequest>, "instanceId">,
 ): Promise<CreateTriggerResponse> {
   return client.runtimeService.createTrigger({
     instanceId: client.instanceId,
@@ -2347,13 +2337,13 @@ export function getRuntimeServiceCreateTriggerMutationOptions(
     CreateMutationOptions<
       CreateTriggerResponse,
       unknown,
-      PartialMessage<Omit<CreateTriggerRequest, "instanceId">>
+      Omit<PartialMessage<CreateTriggerRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   CreateTriggerResponse,
   unknown,
-  PartialMessage<Omit<CreateTriggerRequest, "instanceId">>
+  Omit<PartialMessage<CreateTriggerRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceCreateTrigger(client, request),
@@ -2367,14 +2357,14 @@ export function createRuntimeServiceCreateTriggerMutation(
     CreateMutationOptions<
       CreateTriggerResponse,
       unknown,
-      PartialMessage<Omit<CreateTriggerRequest, "instanceId">>
+      Omit<PartialMessage<CreateTriggerRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   CreateTriggerResponse,
   unknown,
-  PartialMessage<Omit<CreateTriggerRequest, "instanceId">>
+  Omit<PartialMessage<CreateTriggerRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceCreateTriggerMutationOptions(
     client,
@@ -2388,7 +2378,7 @@ export function createRuntimeServiceCreateTriggerMutation(
  */
 export function runtimeServiceShareConversation(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ShareConversationRequest, "instanceId">>,
+  request: Omit<PartialMessage<ShareConversationRequest>, "instanceId">,
 ): Promise<ShareConversationResponse> {
   return client.runtimeService.shareConversation({
     instanceId: client.instanceId,
@@ -2402,13 +2392,13 @@ export function getRuntimeServiceShareConversationMutationOptions(
     CreateMutationOptions<
       ShareConversationResponse,
       unknown,
-      PartialMessage<Omit<ShareConversationRequest, "instanceId">>
+      Omit<PartialMessage<ShareConversationRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   ShareConversationResponse,
   unknown,
-  PartialMessage<Omit<ShareConversationRequest, "instanceId">>
+  Omit<PartialMessage<ShareConversationRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceShareConversation(client, request),
@@ -2422,14 +2412,14 @@ export function createRuntimeServiceShareConversationMutation(
     CreateMutationOptions<
       ShareConversationResponse,
       unknown,
-      PartialMessage<Omit<ShareConversationRequest, "instanceId">>
+      Omit<PartialMessage<ShareConversationRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   ShareConversationResponse,
   unknown,
-  PartialMessage<Omit<ShareConversationRequest, "instanceId">>
+  Omit<PartialMessage<ShareConversationRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceShareConversationMutationOptions(
     client,
@@ -2443,7 +2433,7 @@ export function createRuntimeServiceShareConversationMutation(
  */
 export function runtimeServiceForkConversation(
   client: RuntimeClient,
-  request: PartialMessage<Omit<ForkConversationRequest, "instanceId">>,
+  request: Omit<PartialMessage<ForkConversationRequest>, "instanceId">,
 ): Promise<ForkConversationResponse> {
   return client.runtimeService.forkConversation({
     instanceId: client.instanceId,
@@ -2457,13 +2447,13 @@ export function getRuntimeServiceForkConversationMutationOptions(
     CreateMutationOptions<
       ForkConversationResponse,
       unknown,
-      PartialMessage<Omit<ForkConversationRequest, "instanceId">>
+      Omit<PartialMessage<ForkConversationRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   ForkConversationResponse,
   unknown,
-  PartialMessage<Omit<ForkConversationRequest, "instanceId">>
+  Omit<PartialMessage<ForkConversationRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceForkConversation(client, request),
@@ -2477,14 +2467,14 @@ export function createRuntimeServiceForkConversationMutation(
     CreateMutationOptions<
       ForkConversationResponse,
       unknown,
-      PartialMessage<Omit<ForkConversationRequest, "instanceId">>
+      Omit<PartialMessage<ForkConversationRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   ForkConversationResponse,
   unknown,
-  PartialMessage<Omit<ForkConversationRequest, "instanceId">>
+  Omit<PartialMessage<ForkConversationRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceForkConversationMutationOptions(
     client,
@@ -2498,7 +2488,7 @@ export function createRuntimeServiceForkConversationMutation(
  */
 export function runtimeServiceComplete(
   client: RuntimeClient,
-  request: PartialMessage<Omit<CompleteRequest, "instanceId">>,
+  request: Omit<PartialMessage<CompleteRequest>, "instanceId">,
 ): Promise<CompleteResponse> {
   return client.runtimeService.complete({
     instanceId: client.instanceId,
@@ -2512,13 +2502,13 @@ export function getRuntimeServiceCompleteMutationOptions(
     CreateMutationOptions<
       CompleteResponse,
       unknown,
-      PartialMessage<Omit<CompleteRequest, "instanceId">>
+      Omit<PartialMessage<CompleteRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   CompleteResponse,
   unknown,
-  PartialMessage<Omit<CompleteRequest, "instanceId">>
+  Omit<PartialMessage<CompleteRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceComplete(client, request),
@@ -2532,14 +2522,14 @@ export function createRuntimeServiceCompleteMutation(
     CreateMutationOptions<
       CompleteResponse,
       unknown,
-      PartialMessage<Omit<CompleteRequest, "instanceId">>
+      Omit<PartialMessage<CompleteRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   CompleteResponse,
   unknown,
-  PartialMessage<Omit<CompleteRequest, "instanceId">>
+  Omit<PartialMessage<CompleteRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceCompleteMutationOptions(
     client,
@@ -2553,7 +2543,7 @@ export function createRuntimeServiceCompleteMutation(
  */
 export function runtimeServiceGitStatus(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GitStatusRequest, "instanceId">>,
+  request: Omit<PartialMessage<GitStatusRequest>, "instanceId">,
 ): Promise<GitStatusResponse> {
   return client.runtimeService.gitStatus({
     instanceId: client.instanceId,
@@ -2567,13 +2557,13 @@ export function getRuntimeServiceGitStatusMutationOptions(
     CreateMutationOptions<
       GitStatusResponse,
       unknown,
-      PartialMessage<Omit<GitStatusRequest, "instanceId">>
+      Omit<PartialMessage<GitStatusRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GitStatusResponse,
   unknown,
-  PartialMessage<Omit<GitStatusRequest, "instanceId">>
+  Omit<PartialMessage<GitStatusRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGitStatus(client, request),
@@ -2587,14 +2577,14 @@ export function createRuntimeServiceGitStatusMutation(
     CreateMutationOptions<
       GitStatusResponse,
       unknown,
-      PartialMessage<Omit<GitStatusRequest, "instanceId">>
+      Omit<PartialMessage<GitStatusRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GitStatusResponse,
   unknown,
-  PartialMessage<Omit<GitStatusRequest, "instanceId">>
+  Omit<PartialMessage<GitStatusRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGitStatusMutationOptions(
     client,
@@ -2608,7 +2598,7 @@ export function createRuntimeServiceGitStatusMutation(
  */
 export function runtimeServiceGitCommit(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GitCommitRequest, "instanceId">>,
+  request: Omit<PartialMessage<GitCommitRequest>, "instanceId">,
 ): Promise<GitCommitResponse> {
   return client.runtimeService.gitCommit({
     instanceId: client.instanceId,
@@ -2622,13 +2612,13 @@ export function getRuntimeServiceGitCommitMutationOptions(
     CreateMutationOptions<
       GitCommitResponse,
       unknown,
-      PartialMessage<Omit<GitCommitRequest, "instanceId">>
+      Omit<PartialMessage<GitCommitRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GitCommitResponse,
   unknown,
-  PartialMessage<Omit<GitCommitRequest, "instanceId">>
+  Omit<PartialMessage<GitCommitRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGitCommit(client, request),
@@ -2642,14 +2632,14 @@ export function createRuntimeServiceGitCommitMutation(
     CreateMutationOptions<
       GitCommitResponse,
       unknown,
-      PartialMessage<Omit<GitCommitRequest, "instanceId">>
+      Omit<PartialMessage<GitCommitRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GitCommitResponse,
   unknown,
-  PartialMessage<Omit<GitCommitRequest, "instanceId">>
+  Omit<PartialMessage<GitCommitRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGitCommitMutationOptions(
     client,
@@ -2663,7 +2653,7 @@ export function createRuntimeServiceGitCommitMutation(
  */
 export function runtimeServiceRestoreGitCommit(
   client: RuntimeClient,
-  request: PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>,
+  request: Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">,
 ): Promise<RestoreGitCommitResponse> {
   return client.runtimeService.restoreGitCommit({
     instanceId: client.instanceId,
@@ -2677,13 +2667,13 @@ export function getRuntimeServiceRestoreGitCommitMutationOptions(
     CreateMutationOptions<
       RestoreGitCommitResponse,
       unknown,
-      PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>
+      Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   RestoreGitCommitResponse,
   unknown,
-  PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>
+  Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceRestoreGitCommit(client, request),
@@ -2697,14 +2687,14 @@ export function createRuntimeServiceRestoreGitCommitMutation(
     CreateMutationOptions<
       RestoreGitCommitResponse,
       unknown,
-      PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>
+      Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   RestoreGitCommitResponse,
   unknown,
-  PartialMessage<Omit<RestoreGitCommitRequest, "instanceId">>
+  Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceRestoreGitCommitMutationOptions(
     client,
@@ -2718,7 +2708,7 @@ export function createRuntimeServiceRestoreGitCommitMutation(
  */
 export function runtimeServiceGitMergeToBranch(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>,
+  request: Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">,
 ): Promise<GitMergeToBranchResponse> {
   return client.runtimeService.gitMergeToBranch({
     instanceId: client.instanceId,
@@ -2732,13 +2722,13 @@ export function getRuntimeServiceGitMergeToBranchMutationOptions(
     CreateMutationOptions<
       GitMergeToBranchResponse,
       unknown,
-      PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>
+      Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GitMergeToBranchResponse,
   unknown,
-  PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>
+  Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGitMergeToBranch(client, request),
@@ -2752,14 +2742,14 @@ export function createRuntimeServiceGitMergeToBranchMutation(
     CreateMutationOptions<
       GitMergeToBranchResponse,
       unknown,
-      PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>
+      Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GitMergeToBranchResponse,
   unknown,
-  PartialMessage<Omit<GitMergeToBranchRequest, "instanceId">>
+  Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGitMergeToBranchMutationOptions(
     client,
@@ -2773,7 +2763,7 @@ export function createRuntimeServiceGitMergeToBranchMutation(
  */
 export function runtimeServiceGitSwitchBranch(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>,
+  request: Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">,
 ): Promise<GitSwitchBranchResponse> {
   return client.runtimeService.gitSwitchBranch({
     instanceId: client.instanceId,
@@ -2787,13 +2777,13 @@ export function getRuntimeServiceGitSwitchBranchMutationOptions(
     CreateMutationOptions<
       GitSwitchBranchResponse,
       unknown,
-      PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>
+      Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GitSwitchBranchResponse,
   unknown,
-  PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>
+  Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGitSwitchBranch(client, request),
@@ -2807,14 +2797,14 @@ export function createRuntimeServiceGitSwitchBranchMutation(
     CreateMutationOptions<
       GitSwitchBranchResponse,
       unknown,
-      PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>
+      Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GitSwitchBranchResponse,
   unknown,
-  PartialMessage<Omit<GitSwitchBranchRequest, "instanceId">>
+  Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGitSwitchBranchMutationOptions(
     client,
@@ -2828,7 +2818,7 @@ export function createRuntimeServiceGitSwitchBranchMutation(
  */
 export function runtimeServiceGitPull(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GitPullRequest, "instanceId">>,
+  request: Omit<PartialMessage<GitPullRequest>, "instanceId">,
 ): Promise<GitPullResponse> {
   return client.runtimeService.gitPull({
     instanceId: client.instanceId,
@@ -2842,13 +2832,13 @@ export function getRuntimeServiceGitPullMutationOptions(
     CreateMutationOptions<
       GitPullResponse,
       unknown,
-      PartialMessage<Omit<GitPullRequest, "instanceId">>
+      Omit<PartialMessage<GitPullRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GitPullResponse,
   unknown,
-  PartialMessage<Omit<GitPullRequest, "instanceId">>
+  Omit<PartialMessage<GitPullRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGitPull(client, request),
@@ -2862,14 +2852,14 @@ export function createRuntimeServiceGitPullMutation(
     CreateMutationOptions<
       GitPullResponse,
       unknown,
-      PartialMessage<Omit<GitPullRequest, "instanceId">>
+      Omit<PartialMessage<GitPullRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GitPullResponse,
   unknown,
-  PartialMessage<Omit<GitPullRequest, "instanceId">>
+  Omit<PartialMessage<GitPullRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGitPullMutationOptions(
     client,
@@ -2883,7 +2873,7 @@ export function createRuntimeServiceGitPullMutation(
  */
 export function runtimeServiceGitPush(
   client: RuntimeClient,
-  request: PartialMessage<Omit<GitPushRequest, "instanceId">>,
+  request: Omit<PartialMessage<GitPushRequest>, "instanceId">,
 ): Promise<GitPushResponse> {
   return client.runtimeService.gitPush({
     instanceId: client.instanceId,
@@ -2897,13 +2887,13 @@ export function getRuntimeServiceGitPushMutationOptions(
     CreateMutationOptions<
       GitPushResponse,
       unknown,
-      PartialMessage<Omit<GitPushRequest, "instanceId">>
+      Omit<PartialMessage<GitPushRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
   GitPushResponse,
   unknown,
-  PartialMessage<Omit<GitPushRequest, "instanceId">>
+  Omit<PartialMessage<GitPushRequest>, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceGitPush(client, request),
@@ -2917,14 +2907,14 @@ export function createRuntimeServiceGitPushMutation(
     CreateMutationOptions<
       GitPushResponse,
       unknown,
-      PartialMessage<Omit<GitPushRequest, "instanceId">>
+      Omit<PartialMessage<GitPushRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
   GitPushResponse,
   unknown,
-  PartialMessage<Omit<GitPushRequest, "instanceId">>
+  Omit<PartialMessage<GitPushRequest>, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceGitPushMutationOptions(
     client,

From 366c809532b5a836b309b03462ceb527d18ad60a Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 12:34:01 +0300
Subject: [PATCH 05/27] fix: prevent reactive loop in runtime store bridge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When RuntimeProvider calls setRuntime with no JWT (local dev), the
equality check compared authContext ("user") against current.jwt?.authContext
(undefined), always returning false. This caused the store to emit a new
value on every call, triggering an infinite reactive loop:
RuntimeProvider bridge → store update → layout re-render → bridge again.

Fix by treating JWT as unchanged when both old and new JWT are absent,
regardless of authContext.
---
 web-common/src/runtime-client/runtime-store.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/web-common/src/runtime-client/runtime-store.ts b/web-common/src/runtime-client/runtime-store.ts
index ea2ddce7de5..dba748f1a7e 100644
--- a/web-common/src/runtime-client/runtime-store.ts
+++ b/web-common/src/runtime-client/runtime-store.ts
@@ -44,11 +44,14 @@ const createRuntimeStore = () => {
       update((current) => {
         // Don't update the store if the values have not changed
         // (especially, don't update the JWT `receivedAt`)
+        const jwtUnchanged = jwt
+          ? jwt === current.jwt?.token &&
+            authContext === current.jwt?.authContext
+          : !current.jwt;
         if (
           host === current.host &&
           instanceId === current.instanceId &&
-          jwt === current.jwt?.token &&
-          authContext === current.jwt?.authContext
+          jwtUnchanged
         ) {
           return current;
         }

From 13adf06be65472aa0cf1cc800f8797a1ac7102d5 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 14:13:15 +0300
Subject: [PATCH 06/27] feat: add JSON bridge to v2 code generator (Phase 4)

Generated hooks now accept/return Orval-compatible types (V1*) in their
public API, converting to/from proto internally via fromJson/toJson.
This lets consumers switch to v2 hooks without changing their existing
type usage (V1Expression, V1Resource, etc.).

The generator reads the Orval schemas file at generation time to
determine which V1 types exist. Response types always use V1 (100%
coverage). Request types use V1 when available (~25%, POST endpoints)
and fall back to PartialMessage<ProtoType> for GET endpoints.
---
 web-common/scripts/generate-query-hooks.ts    |  132 +-
 .../v2/gen/connector-service.ts               |  193 +--
 .../runtime-client/v2/gen/query-service.ts    | 1058 ++++++++------
 .../runtime-client/v2/gen/runtime-service.ts  | 1246 ++++++++++-------
 4 files changed, 1572 insertions(+), 1057 deletions(-)

diff --git a/web-common/scripts/generate-query-hooks.ts b/web-common/scripts/generate-query-hooks.ts
index cd0d86d5450..7a1c8a08e44 100644
--- a/web-common/scripts/generate-query-hooks.ts
+++ b/web-common/scripts/generate-query-hooks.ts
@@ -90,6 +90,38 @@ function getProtoImportPath(serviceName: string): string {
   return `../../../proto/gen/rill/runtime/v1/${fileMap[serviceName]}`;
 }
 
+// --- JSON bridge: Orval type helpers ---
+
+/** Read Orval schemas to discover available V1 types at generation time */
+const orvalSchemaPath = path.resolve(
+  __dirname,
+  "../src/runtime-client/gen/index.schemas.ts",
+);
+const orvalSchemaContent = fs.readFileSync(orvalSchemaPath, "utf-8");
+const availableOrvalTypes = new Set<string>();
+for (const match of orvalSchemaContent.matchAll(
+  /^export (?:type|interface) (\w+)/gm,
+)) {
+  availableOrvalTypes.add(match[1]);
+}
+
+const ORVAL_IMPORT_PATH = "../../gen/index.schemas";
+
+function orvalTypeName(protoTypeName: string): string {
+  return `V1${protoTypeName}`;
+}
+
+function hasOrvalType(protoTypeName: string): boolean {
+  return availableOrvalTypes.has(orvalTypeName(protoTypeName));
+}
+
+/** Get the public-facing type for a request or response */
+function publicType(protoTypeName: string): string {
+  return hasOrvalType(protoTypeName)
+    ? orvalTypeName(protoTypeName)
+    : `PartialMessage<${protoTypeName}>`;
+}
+
 // --- Method extraction ---
 
 function extractMethods(service: ServiceDef): MethodInfo[] {
@@ -133,11 +165,26 @@ function generateServiceFile(service: ServiceDef): string {
     (m) => m.classification === "mutation",
   );
 
-  // Collect all request/response types we need to import
+  // Collect proto types (value imports; needed for fromJson/toJson calls)
   const protoTypes = new Set<string>();
+  // Collect Orval types (type-only imports; used in public API signatures)
+  const orvalTypes = new Set<string>();
+  // Track whether PartialMessage is needed (for request types without V1 counterparts)
+  let needsPartialMessage = false;
+
   for (const m of methods) {
     protoTypes.add(m.inputType);
-    protoTypes.add(m.outputType);
+
+    if (hasOrvalType(m.inputType)) {
+      orvalTypes.add(orvalTypeName(m.inputType));
+    } else {
+      needsPartialMessage = true;
+      // Still need proto type for PartialMessage<> reference
+    }
+
+    if (hasOrvalType(m.outputType)) {
+      orvalTypes.add(orvalTypeName(m.outputType));
+    }
   }
 
   const lines: string[] = [];
@@ -146,9 +193,14 @@ function generateServiceFile(service: ServiceDef): string {
   lines.push(`// Generated by generate-query-hooks.ts — DO NOT EDIT`);
   lines.push(``);
   lines.push(`import type { RuntimeClient } from "../runtime-client";`);
+
+  // @bufbuild/protobuf imports (JsonValue always needed; PartialMessage conditional)
+  const bufImports: string[] = ["JsonValue"];
+  if (needsPartialMessage) bufImports.unshift("PartialMessage");
   lines.push(
-    `import type { PartialMessage } from "@bufbuild/protobuf";`,
+    `import type { ${bufImports.join(", ")} } from "@bufbuild/protobuf";`,
   );
+
   lines.push(
     `import {`,
     `  createQuery,`,
@@ -163,12 +215,24 @@ function generateServiceFile(service: ServiceDef): string {
     `} from "@tanstack/svelte-query";`,
   );
 
-  // Proto type imports
-  const sortedTypes = [...protoTypes].sort();
+  // Orval type imports (type-only; for public API signatures)
+  if (orvalTypes.size > 0) {
+    const sortedOrval = [...orvalTypes].sort();
+    lines.push(
+      `import type {`,
+      ...sortedOrval.map(
+        (t, i) => `  ${t}${i < sortedOrval.length - 1 ? "," : ""}`,
+      ),
+      `} from "${ORVAL_IMPORT_PATH}";`,
+    );
+  }
+
+  // Proto type imports (value imports; needed for fromJson calls)
+  const sortedProto = [...protoTypes].sort();
   lines.push(
     `import {`,
-    ...sortedTypes.map((t, i) =>
-      `  ${t}${i < sortedTypes.length - 1 ? "," : ""}`,
+    ...sortedProto.map(
+      (t, i) => `  ${t}${i < sortedProto.length - 1 ? "," : ""}`,
     ),
     `} from "${protoImportPath}";`,
   );
@@ -182,15 +246,19 @@ function generateServiceFile(service: ServiceDef): string {
     const optsFnName = `get${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}QueryOptions`;
     const hookName = `create${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}`;
 
-    // Request type: omit instanceId when the proto message has it (client injects it)
+    // Public-facing request type (V1 Orval when available, PartialMessage fallback)
+    const inputPublic = publicType(m.inputType);
     const requestType = m.hasInstanceId
-      ? `Omit<PartialMessage<${m.inputType}>, "instanceId">`
-      : `PartialMessage<${m.inputType}>`;
+      ? `Omit<${inputPublic}, "instanceId">`
+      : inputPublic;
     const requestSpread = m.hasInstanceId
       ? `{ instanceId: client.instanceId, ...request }`
       : `request`;
 
-    // Tier 1: Raw function
+    // Public-facing response type (always V1 Orval)
+    const responseType = publicType(m.outputType);
+
+    // Tier 1: Raw function (JSON bridge: fromJson on input, toJson on output)
     lines.push(
       `/**`,
       ` * Raw RPC call: ${serviceName}.${m.methodName}`,
@@ -199,11 +267,11 @@ function generateServiceFile(service: ServiceDef): string {
       `  client: RuntimeClient,`,
       `  request: ${requestType},`,
       `  options?: { signal?: AbortSignal },`,
-      `): Promise<${m.outputType}> {`,
+      `): Promise<${responseType}> {`,
       `  return client.${serviceClientProp}.${m.methodKey}(`,
-      `    ${requestSpread},`,
+      `    ${m.inputType}.fromJson(${requestSpread} as unknown as JsonValue),`,
       `    { signal: options?.signal },`,
-      `  );`,
+      `  ).then(r => r.toJson() as unknown as ${responseType});`,
       `}`,
       ``,
     );
@@ -225,11 +293,11 @@ function generateServiceFile(service: ServiceDef): string {
       `  client: RuntimeClient,`,
       `  request: ${requestType},`,
       `  options?: {`,
-      `    query?: Partial<CreateQueryOptions<${m.outputType}>>;`,
+      `    query?: Partial<CreateQueryOptions<${responseType}>>;`,
       `  },`,
-      `): CreateQueryOptions<${m.outputType}> & { queryKey: QueryKey } {`,
+      `): CreateQueryOptions<${responseType}> & { queryKey: QueryKey } {`,
       `  const queryKey = ${keyFnName}(client.instanceId, request);`,
-      `  const queryFn: QueryFunction<${m.outputType}> = ({ signal }) =>`,
+      `  const queryFn: QueryFunction<${responseType}> = ({ signal }) =>`,
       `    ${fullName}(client, request, { signal });`,
       `  return {`,
       `    queryKey,`,
@@ -247,10 +315,10 @@ function generateServiceFile(service: ServiceDef): string {
       `  client: RuntimeClient,`,
       `  request: ${requestType},`,
       `  options?: {`,
-      `    query?: Partial<CreateQueryOptions<${m.outputType}>>;`,
+      `    query?: Partial<CreateQueryOptions<${responseType}>>;`,
       `  },`,
       `  queryClient?: QueryClient,`,
-      `): CreateQueryResult<${m.outputType}> {`,
+      `): CreateQueryResult<${responseType}> {`,
       `  const queryOptions = ${optsFnName}(client, request, options);`,
       `  return createQuery(queryOptions, queryClient);`,
       `}`,
@@ -264,15 +332,19 @@ function generateServiceFile(service: ServiceDef): string {
     const mutOptsFnName = `get${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}MutationOptions`;
     const mutHookName = `create${pascalCase(serviceClientProp)}${pascalCase(m.methodKey)}Mutation`;
 
-    // Request type: omit instanceId when the proto message has it
+    // Public-facing request type (V1 Orval when available, PartialMessage fallback)
+    const inputPublic = publicType(m.inputType);
     const requestType = m.hasInstanceId
-      ? `Omit<PartialMessage<${m.inputType}>, "instanceId">`
-      : `PartialMessage<${m.inputType}>`;
+      ? `Omit<${inputPublic}, "instanceId">`
+      : inputPublic;
     const requestSpread = m.hasInstanceId
       ? `{ instanceId: client.instanceId, ...request }`
       : `request`;
 
-    // Raw function
+    // Public-facing response type (always V1 Orval)
+    const responseType = publicType(m.outputType);
+
+    // Raw function (JSON bridge: fromJson on input, toJson on output)
     lines.push(
       `/**`,
       ` * Raw RPC call (mutation): ${serviceName}.${m.methodName}`,
@@ -280,10 +352,10 @@ function generateServiceFile(service: ServiceDef): string {
       `export function ${fullName}(`,
       `  client: RuntimeClient,`,
       `  request: ${requestType},`,
-      `): Promise<${m.outputType}> {`,
+      `): Promise<${responseType}> {`,
       `  return client.${serviceClientProp}.${m.methodKey}(`,
-      `    ${requestSpread},`,
-      `  );`,
+      `    ${m.inputType}.fromJson(${requestSpread} as unknown as JsonValue),`,
+      `  ).then(r => r.toJson() as unknown as ${responseType});`,
       `}`,
       ``,
     );
@@ -292,8 +364,8 @@ function generateServiceFile(service: ServiceDef): string {
     lines.push(
       `export function ${mutOptsFnName}(`,
       `  client: RuntimeClient,`,
-      `  options?: Partial<CreateMutationOptions<${m.outputType}, unknown, ${requestType}>>,`,
-      `): CreateMutationOptions<${m.outputType}, unknown, ${requestType}> {`,
+      `  options?: Partial<CreateMutationOptions<${responseType}, unknown, ${requestType}>>,`,
+      `): CreateMutationOptions<${responseType}, unknown, ${requestType}> {`,
       `  return {`,
       `    mutationFn: (request) => ${fullName}(client, request),`,
       `    ...options,`,
@@ -306,9 +378,9 @@ function generateServiceFile(service: ServiceDef): string {
     lines.push(
       `export function ${mutHookName}(`,
       `  client: RuntimeClient,`,
-      `  options?: Partial<CreateMutationOptions<${m.outputType}, unknown, ${requestType}>>,`,
+      `  options?: Partial<CreateMutationOptions<${responseType}, unknown, ${requestType}>>,`,
       `  queryClient?: QueryClient,`,
-      `): CreateMutationResult<${m.outputType}, unknown, ${requestType}> {`,
+      `): CreateMutationResult<${responseType}, unknown, ${requestType}> {`,
       `  const mutationOptions = ${mutOptsFnName}(client, options);`,
       `  return createMutation(mutationOptions, queryClient);`,
       `}`,
diff --git a/web-common/src/runtime-client/v2/gen/connector-service.ts b/web-common/src/runtime-client/v2/gen/connector-service.ts
index ab996a238f9..5d7fb9087b8 100644
--- a/web-common/src/runtime-client/v2/gen/connector-service.ts
+++ b/web-common/src/runtime-client/v2/gen/connector-service.ts
@@ -1,7 +1,7 @@
 // Generated by generate-query-hooks.ts — DO NOT EDIT
 
 import type { RuntimeClient } from "../runtime-client";
-import type { PartialMessage } from "@bufbuild/protobuf";
+import type { PartialMessage, JsonValue } from "@bufbuild/protobuf";
 import {
   createQuery,
   createMutation,
@@ -13,21 +13,23 @@ import {
   type CreateMutationOptions,
   type CreateMutationResult,
 } from "@tanstack/svelte-query";
+import type {
+  V1GetTableResponse,
+  V1ListBucketsResponse,
+  V1ListDatabaseSchemasResponse,
+  V1ListObjectsResponse,
+  V1ListTablesResponse,
+  V1OLAPGetTableResponse,
+  V1OLAPListTablesResponse,
+} from "../../gen/index.schemas";
 import {
   GetTableRequest,
-  GetTableResponse,
   ListBucketsRequest,
-  ListBucketsResponse,
   ListDatabaseSchemasRequest,
-  ListDatabaseSchemasResponse,
   ListObjectsRequest,
-  ListObjectsResponse,
   ListTablesRequest,
-  ListTablesResponse,
   OLAPGetTableRequest,
-  OLAPGetTableResponse,
   OLAPListTablesRequest,
-  OLAPListTablesResponse,
 } from "../../../proto/gen/rill/runtime/v1/connectors_pb";
 
 /**
@@ -37,11 +39,16 @@ export function connectorServiceListBuckets(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListBucketsResponse> {
-  return client.connectorService.listBuckets(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListBucketsResponse> {
+  return client.connectorService
+    .listBuckets(
+      ListBucketsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListBucketsResponse);
 }
 
 export function getConnectorServiceListBucketsQueryKey(
@@ -60,14 +67,14 @@ export function getConnectorServiceListBucketsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListBucketsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListBucketsResponse>>;
   },
-): CreateQueryOptions<ListBucketsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListBucketsResponse> & { queryKey: QueryKey } {
   const queryKey = getConnectorServiceListBucketsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListBucketsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListBucketsResponse> = ({ signal }) =>
     connectorServiceListBuckets(client, request, { signal });
   return {
     queryKey,
@@ -81,10 +88,10 @@ export function createConnectorServiceListBuckets(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListBucketsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListBucketsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListBucketsResponse> {
+): CreateQueryResult<V1ListBucketsResponse> {
   const queryOptions = getConnectorServiceListBucketsQueryOptions(
     client,
     request,
@@ -100,11 +107,16 @@ export function connectorServiceListObjects(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListObjectsResponse> {
-  return client.connectorService.listObjects(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListObjectsResponse> {
+  return client.connectorService
+    .listObjects(
+      ListObjectsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListObjectsResponse);
 }
 
 export function getConnectorServiceListObjectsQueryKey(
@@ -123,14 +135,14 @@ export function getConnectorServiceListObjectsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListObjectsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListObjectsResponse>>;
   },
-): CreateQueryOptions<ListObjectsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListObjectsResponse> & { queryKey: QueryKey } {
   const queryKey = getConnectorServiceListObjectsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListObjectsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListObjectsResponse> = ({ signal }) =>
     connectorServiceListObjects(client, request, { signal });
   return {
     queryKey,
@@ -144,10 +156,10 @@ export function createConnectorServiceListObjects(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListObjectsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListObjectsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListObjectsResponse> {
+): CreateQueryResult<V1ListObjectsResponse> {
   const queryOptions = getConnectorServiceListObjectsQueryOptions(
     client,
     request,
@@ -163,11 +175,16 @@ export function connectorServiceOLAPListTables(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<OLAPListTablesResponse> {
-  return client.connectorService.oLAPListTables(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1OLAPListTablesResponse> {
+  return client.connectorService
+    .oLAPListTables(
+      OLAPListTablesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1OLAPListTablesResponse);
 }
 
 export function getConnectorServiceOLAPListTablesQueryKey(
@@ -186,14 +203,14 @@ export function getConnectorServiceOLAPListTablesQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<OLAPListTablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1OLAPListTablesResponse>>;
   },
-): CreateQueryOptions<OLAPListTablesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1OLAPListTablesResponse> & { queryKey: QueryKey } {
   const queryKey = getConnectorServiceOLAPListTablesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<OLAPListTablesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1OLAPListTablesResponse> = ({ signal }) =>
     connectorServiceOLAPListTables(client, request, { signal });
   return {
     queryKey,
@@ -207,10 +224,10 @@ export function createConnectorServiceOLAPListTables(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<OLAPListTablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1OLAPListTablesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<OLAPListTablesResponse> {
+): CreateQueryResult<V1OLAPListTablesResponse> {
   const queryOptions = getConnectorServiceOLAPListTablesQueryOptions(
     client,
     request,
@@ -226,11 +243,16 @@ export function connectorServiceOLAPGetTable(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<OLAPGetTableResponse> {
-  return client.connectorService.oLAPGetTable(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1OLAPGetTableResponse> {
+  return client.connectorService
+    .oLAPGetTable(
+      OLAPGetTableRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1OLAPGetTableResponse);
 }
 
 export function getConnectorServiceOLAPGetTableQueryKey(
@@ -249,14 +271,14 @@ export function getConnectorServiceOLAPGetTableQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<OLAPGetTableResponse>>;
+    query?: Partial<CreateQueryOptions<V1OLAPGetTableResponse>>;
   },
-): CreateQueryOptions<OLAPGetTableResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1OLAPGetTableResponse> & { queryKey: QueryKey } {
   const queryKey = getConnectorServiceOLAPGetTableQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<OLAPGetTableResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1OLAPGetTableResponse> = ({ signal }) =>
     connectorServiceOLAPGetTable(client, request, { signal });
   return {
     queryKey,
@@ -270,10 +292,10 @@ export function createConnectorServiceOLAPGetTable(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<OLAPGetTableResponse>>;
+    query?: Partial<CreateQueryOptions<V1OLAPGetTableResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<OLAPGetTableResponse> {
+): CreateQueryResult<V1OLAPGetTableResponse> {
   const queryOptions = getConnectorServiceOLAPGetTableQueryOptions(
     client,
     request,
@@ -289,11 +311,16 @@ export function connectorServiceListDatabaseSchemas(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListDatabaseSchemasResponse> {
-  return client.connectorService.listDatabaseSchemas(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListDatabaseSchemasResponse> {
+  return client.connectorService
+    .listDatabaseSchemas(
+      ListDatabaseSchemasRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListDatabaseSchemasResponse);
 }
 
 export function getConnectorServiceListDatabaseSchemasQueryKey(
@@ -312,14 +339,14 @@ export function getConnectorServiceListDatabaseSchemasQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListDatabaseSchemasResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListDatabaseSchemasResponse>>;
   },
-): CreateQueryOptions<ListDatabaseSchemasResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListDatabaseSchemasResponse> & { queryKey: QueryKey } {
   const queryKey = getConnectorServiceListDatabaseSchemasQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListDatabaseSchemasResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListDatabaseSchemasResponse> = ({ signal }) =>
     connectorServiceListDatabaseSchemas(client, request, { signal });
   return {
     queryKey,
@@ -333,10 +360,10 @@ export function createConnectorServiceListDatabaseSchemas(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListDatabaseSchemasResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListDatabaseSchemasResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListDatabaseSchemasResponse> {
+): CreateQueryResult<V1ListDatabaseSchemasResponse> {
   const queryOptions = getConnectorServiceListDatabaseSchemasQueryOptions(
     client,
     request,
@@ -352,11 +379,16 @@ export function connectorServiceListTables(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListTablesResponse> {
-  return client.connectorService.listTables(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListTablesResponse> {
+  return client.connectorService
+    .listTables(
+      ListTablesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListTablesResponse);
 }
 
 export function getConnectorServiceListTablesQueryKey(
@@ -370,14 +402,14 @@ export function getConnectorServiceListTablesQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListTablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListTablesResponse>>;
   },
-): CreateQueryOptions<ListTablesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListTablesResponse> & { queryKey: QueryKey } {
   const queryKey = getConnectorServiceListTablesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListTablesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListTablesResponse> = ({ signal }) =>
     connectorServiceListTables(client, request, { signal });
   return {
     queryKey,
@@ -391,10 +423,10 @@ export function createConnectorServiceListTables(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListTablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListTablesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListTablesResponse> {
+): CreateQueryResult<V1ListTablesResponse> {
   const queryOptions = getConnectorServiceListTablesQueryOptions(
     client,
     request,
@@ -410,11 +442,16 @@ export function connectorServiceGetTable(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetTableRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<GetTableResponse> {
-  return client.connectorService.getTable(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1GetTableResponse> {
+  return client.connectorService
+    .getTable(
+      GetTableRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1GetTableResponse);
 }
 
 export function getConnectorServiceGetTableQueryKey(
@@ -428,14 +465,14 @@ export function getConnectorServiceGetTableQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetTableRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetTableResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetTableResponse>>;
   },
-): CreateQueryOptions<GetTableResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetTableResponse> & { queryKey: QueryKey } {
   const queryKey = getConnectorServiceGetTableQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<GetTableResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1GetTableResponse> = ({ signal }) =>
     connectorServiceGetTable(client, request, { signal });
   return {
     queryKey,
@@ -449,10 +486,10 @@ export function createConnectorServiceGetTable(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetTableRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetTableResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetTableResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<GetTableResponse> {
+): CreateQueryResult<V1GetTableResponse> {
   const queryOptions = getConnectorServiceGetTableQueryOptions(
     client,
     request,
diff --git a/web-common/src/runtime-client/v2/gen/query-service.ts b/web-common/src/runtime-client/v2/gen/query-service.ts
index 3370d890d54..084ddfe39b3 100644
--- a/web-common/src/runtime-client/v2/gen/query-service.ts
+++ b/web-common/src/runtime-client/v2/gen/query-service.ts
@@ -1,7 +1,7 @@
 // Generated by generate-query-hooks.ts — DO NOT EDIT
 
 import type { RuntimeClient } from "../runtime-client";
-import type { PartialMessage } from "@bufbuild/protobuf";
+import type { PartialMessage, JsonValue } from "@bufbuild/protobuf";
 import {
   createQuery,
   createMutation,
@@ -13,69 +13,90 @@ import {
   type CreateMutationOptions,
   type CreateMutationResult,
 } from "@tanstack/svelte-query";
+import type {
+  V1ColumnCardinalityRequest,
+  V1ColumnCardinalityResponse,
+  V1ColumnDescriptiveStatisticsRequest,
+  V1ColumnDescriptiveStatisticsResponse,
+  V1ColumnNullCountRequest,
+  V1ColumnNullCountResponse,
+  V1ColumnNumericHistogramRequest,
+  V1ColumnNumericHistogramResponse,
+  V1ColumnRollupIntervalRequest,
+  V1ColumnRollupIntervalResponse,
+  V1ColumnRugHistogramRequest,
+  V1ColumnRugHistogramResponse,
+  V1ColumnTimeGrainRequest,
+  V1ColumnTimeGrainResponse,
+  V1ColumnTimeRangeRequest,
+  V1ColumnTimeRangeResponse,
+  V1ColumnTimeSeriesRequest,
+  V1ColumnTimeSeriesResponse,
+  V1ColumnTopKRequest,
+  V1ColumnTopKResponse,
+  V1ConvertExpressionToMetricsSQLResponse,
+  V1ExportReportResponse,
+  V1ExportResponse,
+  V1MetricsViewAggregationRequest,
+  V1MetricsViewAggregationResponse,
+  V1MetricsViewAnnotationsResponse,
+  V1MetricsViewComparisonRequest,
+  V1MetricsViewComparisonResponse,
+  V1MetricsViewRowsRequest,
+  V1MetricsViewRowsResponse,
+  V1MetricsViewSchemaResponse,
+  V1MetricsViewSearchResponse,
+  V1MetricsViewTimeRangeResponse,
+  V1MetricsViewTimeRangesResponse,
+  V1MetricsViewTimeSeriesRequest,
+  V1MetricsViewTimeSeriesResponse,
+  V1MetricsViewToplistRequest,
+  V1MetricsViewToplistResponse,
+  V1MetricsViewTotalsRequest,
+  V1MetricsViewTotalsResponse,
+  V1QueryResponse,
+  V1ResolveCanvasResponse,
+  V1ResolveComponentResponse,
+  V1ResolveTemplatedStringResponse,
+  V1TableCardinalityRequest,
+  V1TableCardinalityResponse,
+  V1TableColumnsRequest,
+  V1TableColumnsResponse,
+  V1TableRowsRequest,
+  V1TableRowsResponse,
+} from "../../gen/index.schemas";
 import {
   ColumnCardinalityRequest,
-  ColumnCardinalityResponse,
   ColumnDescriptiveStatisticsRequest,
-  ColumnDescriptiveStatisticsResponse,
   ColumnNullCountRequest,
-  ColumnNullCountResponse,
   ColumnNumericHistogramRequest,
-  ColumnNumericHistogramResponse,
   ColumnRollupIntervalRequest,
-  ColumnRollupIntervalResponse,
   ColumnRugHistogramRequest,
-  ColumnRugHistogramResponse,
   ColumnTimeGrainRequest,
-  ColumnTimeGrainResponse,
   ColumnTimeRangeRequest,
-  ColumnTimeRangeResponse,
   ColumnTimeSeriesRequest,
-  ColumnTimeSeriesResponse,
   ColumnTopKRequest,
-  ColumnTopKResponse,
   ConvertExpressionToMetricsSQLRequest,
-  ConvertExpressionToMetricsSQLResponse,
   ExportReportRequest,
-  ExportReportResponse,
   ExportRequest,
-  ExportResponse,
   MetricsViewAggregationRequest,
-  MetricsViewAggregationResponse,
   MetricsViewAnnotationsRequest,
-  MetricsViewAnnotationsResponse,
   MetricsViewComparisonRequest,
-  MetricsViewComparisonResponse,
   MetricsViewRowsRequest,
-  MetricsViewRowsResponse,
   MetricsViewSchemaRequest,
-  MetricsViewSchemaResponse,
   MetricsViewSearchRequest,
-  MetricsViewSearchResponse,
   MetricsViewTimeRangeRequest,
-  MetricsViewTimeRangeResponse,
   MetricsViewTimeRangesRequest,
-  MetricsViewTimeRangesResponse,
   MetricsViewTimeSeriesRequest,
-  MetricsViewTimeSeriesResponse,
   MetricsViewToplistRequest,
-  MetricsViewToplistResponse,
   MetricsViewTotalsRequest,
-  MetricsViewTotalsResponse,
   QueryRequest,
-  QueryResponse,
   ResolveCanvasRequest,
-  ResolveCanvasResponse,
   ResolveComponentRequest,
-  ResolveComponentResponse,
   ResolveTemplatedStringRequest,
-  ResolveTemplatedStringResponse,
   TableCardinalityRequest,
-  TableCardinalityResponse,
   TableColumnsRequest,
-  TableColumnsResponse,
   TableRowsRequest,
-  TableRowsResponse,
 } from "../../../proto/gen/rill/runtime/v1/queries_pb";
 
 /**
@@ -83,18 +104,23 @@ import {
  */
 export function queryServiceMetricsViewAggregation(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewAggregationRequest>, "instanceId">,
+  request: Omit<V1MetricsViewAggregationRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewAggregationResponse> {
-  return client.queryService.metricsViewAggregation(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewAggregationResponse> {
+  return client.queryService
+    .metricsViewAggregation(
+      MetricsViewAggregationRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewAggregationResponse);
 }
 
 export function getQueryServiceMetricsViewAggregationQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<MetricsViewAggregationRequest>, "instanceId">,
+  request?: Omit<V1MetricsViewAggregationRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -106,17 +132,20 @@ export function getQueryServiceMetricsViewAggregationQueryKey(
 
 export function getQueryServiceMetricsViewAggregationQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewAggregationRequest>, "instanceId">,
+  request: Omit<V1MetricsViewAggregationRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewAggregationResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewAggregationResponse>>;
   },
-): CreateQueryOptions<MetricsViewAggregationResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewAggregationResponse> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewAggregationQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewAggregationResponse> = ({ signal }) =>
-    queryServiceMetricsViewAggregation(client, request, { signal });
+  const queryFn: QueryFunction<V1MetricsViewAggregationResponse> = ({
+    signal,
+  }) => queryServiceMetricsViewAggregation(client, request, { signal });
   return {
     queryKey,
     queryFn,
@@ -127,12 +156,12 @@ export function getQueryServiceMetricsViewAggregationQueryOptions(
 
 export function createQueryServiceMetricsViewAggregation(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewAggregationRequest>, "instanceId">,
+  request: Omit<V1MetricsViewAggregationRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewAggregationResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewAggregationResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewAggregationResponse> {
+): CreateQueryResult<V1MetricsViewAggregationResponse> {
   const queryOptions = getQueryServiceMetricsViewAggregationQueryOptions(
     client,
     request,
@@ -146,18 +175,23 @@ export function createQueryServiceMetricsViewAggregation(
  */
 export function queryServiceMetricsViewToplist(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewToplistRequest>, "instanceId">,
+  request: Omit<V1MetricsViewToplistRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewToplistResponse> {
-  return client.queryService.metricsViewToplist(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewToplistResponse> {
+  return client.queryService
+    .metricsViewToplist(
+      MetricsViewToplistRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewToplistResponse);
 }
 
 export function getQueryServiceMetricsViewToplistQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<MetricsViewToplistRequest>, "instanceId">,
+  request?: Omit<V1MetricsViewToplistRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -169,16 +203,16 @@ export function getQueryServiceMetricsViewToplistQueryKey(
 
 export function getQueryServiceMetricsViewToplistQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewToplistRequest>, "instanceId">,
+  request: Omit<V1MetricsViewToplistRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewToplistResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewToplistResponse>>;
   },
-): CreateQueryOptions<MetricsViewToplistResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewToplistResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceMetricsViewToplistQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewToplistResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1MetricsViewToplistResponse> = ({ signal }) =>
     queryServiceMetricsViewToplist(client, request, { signal });
   return {
     queryKey,
@@ -190,12 +224,12 @@ export function getQueryServiceMetricsViewToplistQueryOptions(
 
 export function createQueryServiceMetricsViewToplist(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewToplistRequest>, "instanceId">,
+  request: Omit<V1MetricsViewToplistRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewToplistResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewToplistResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewToplistResponse> {
+): CreateQueryResult<V1MetricsViewToplistResponse> {
   const queryOptions = getQueryServiceMetricsViewToplistQueryOptions(
     client,
     request,
@@ -209,18 +243,23 @@ export function createQueryServiceMetricsViewToplist(
  */
 export function queryServiceMetricsViewComparison(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewComparisonRequest>, "instanceId">,
+  request: Omit<V1MetricsViewComparisonRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewComparisonResponse> {
-  return client.queryService.metricsViewComparison(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewComparisonResponse> {
+  return client.queryService
+    .metricsViewComparison(
+      MetricsViewComparisonRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewComparisonResponse);
 }
 
 export function getQueryServiceMetricsViewComparisonQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<MetricsViewComparisonRequest>, "instanceId">,
+  request?: Omit<V1MetricsViewComparisonRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -232,17 +271,20 @@ export function getQueryServiceMetricsViewComparisonQueryKey(
 
 export function getQueryServiceMetricsViewComparisonQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewComparisonRequest>, "instanceId">,
+  request: Omit<V1MetricsViewComparisonRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewComparisonResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewComparisonResponse>>;
   },
-): CreateQueryOptions<MetricsViewComparisonResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewComparisonResponse> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewComparisonQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewComparisonResponse> = ({ signal }) =>
-    queryServiceMetricsViewComparison(client, request, { signal });
+  const queryFn: QueryFunction<V1MetricsViewComparisonResponse> = ({
+    signal,
+  }) => queryServiceMetricsViewComparison(client, request, { signal });
   return {
     queryKey,
     queryFn,
@@ -253,12 +295,12 @@ export function getQueryServiceMetricsViewComparisonQueryOptions(
 
 export function createQueryServiceMetricsViewComparison(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewComparisonRequest>, "instanceId">,
+  request: Omit<V1MetricsViewComparisonRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewComparisonResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewComparisonResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewComparisonResponse> {
+): CreateQueryResult<V1MetricsViewComparisonResponse> {
   const queryOptions = getQueryServiceMetricsViewComparisonQueryOptions(
     client,
     request,
@@ -272,18 +314,23 @@ export function createQueryServiceMetricsViewComparison(
  */
 export function queryServiceMetricsViewTimeSeries(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewTimeSeriesRequest>, "instanceId">,
+  request: Omit<V1MetricsViewTimeSeriesRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewTimeSeriesResponse> {
-  return client.queryService.metricsViewTimeSeries(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewTimeSeriesResponse> {
+  return client.queryService
+    .metricsViewTimeSeries(
+      MetricsViewTimeSeriesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewTimeSeriesResponse);
 }
 
 export function getQueryServiceMetricsViewTimeSeriesQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<MetricsViewTimeSeriesRequest>, "instanceId">,
+  request?: Omit<V1MetricsViewTimeSeriesRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -295,17 +342,20 @@ export function getQueryServiceMetricsViewTimeSeriesQueryKey(
 
 export function getQueryServiceMetricsViewTimeSeriesQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewTimeSeriesRequest>, "instanceId">,
+  request: Omit<V1MetricsViewTimeSeriesRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewTimeSeriesResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewTimeSeriesResponse>>;
   },
-): CreateQueryOptions<MetricsViewTimeSeriesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewTimeSeriesResponse> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewTimeSeriesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewTimeSeriesResponse> = ({ signal }) =>
-    queryServiceMetricsViewTimeSeries(client, request, { signal });
+  const queryFn: QueryFunction<V1MetricsViewTimeSeriesResponse> = ({
+    signal,
+  }) => queryServiceMetricsViewTimeSeries(client, request, { signal });
   return {
     queryKey,
     queryFn,
@@ -316,12 +366,12 @@ export function getQueryServiceMetricsViewTimeSeriesQueryOptions(
 
 export function createQueryServiceMetricsViewTimeSeries(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewTimeSeriesRequest>, "instanceId">,
+  request: Omit<V1MetricsViewTimeSeriesRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewTimeSeriesResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewTimeSeriesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewTimeSeriesResponse> {
+): CreateQueryResult<V1MetricsViewTimeSeriesResponse> {
   const queryOptions = getQueryServiceMetricsViewTimeSeriesQueryOptions(
     client,
     request,
@@ -335,18 +385,23 @@ export function createQueryServiceMetricsViewTimeSeries(
  */
 export function queryServiceMetricsViewTotals(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewTotalsRequest>, "instanceId">,
+  request: Omit<V1MetricsViewTotalsRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewTotalsResponse> {
-  return client.queryService.metricsViewTotals(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewTotalsResponse> {
+  return client.queryService
+    .metricsViewTotals(
+      MetricsViewTotalsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewTotalsResponse);
 }
 
 export function getQueryServiceMetricsViewTotalsQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<MetricsViewTotalsRequest>, "instanceId">,
+  request?: Omit<V1MetricsViewTotalsRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -358,16 +413,16 @@ export function getQueryServiceMetricsViewTotalsQueryKey(
 
 export function getQueryServiceMetricsViewTotalsQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewTotalsRequest>, "instanceId">,
+  request: Omit<V1MetricsViewTotalsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewTotalsResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewTotalsResponse>>;
   },
-): CreateQueryOptions<MetricsViewTotalsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewTotalsResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceMetricsViewTotalsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewTotalsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1MetricsViewTotalsResponse> = ({ signal }) =>
     queryServiceMetricsViewTotals(client, request, { signal });
   return {
     queryKey,
@@ -379,12 +434,12 @@ export function getQueryServiceMetricsViewTotalsQueryOptions(
 
 export function createQueryServiceMetricsViewTotals(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewTotalsRequest>, "instanceId">,
+  request: Omit<V1MetricsViewTotalsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewTotalsResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewTotalsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewTotalsResponse> {
+): CreateQueryResult<V1MetricsViewTotalsResponse> {
   const queryOptions = getQueryServiceMetricsViewTotalsQueryOptions(
     client,
     request,
@@ -398,18 +453,23 @@ export function createQueryServiceMetricsViewTotals(
  */
 export function queryServiceMetricsViewRows(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewRowsRequest>, "instanceId">,
+  request: Omit<V1MetricsViewRowsRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewRowsResponse> {
-  return client.queryService.metricsViewRows(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewRowsResponse> {
+  return client.queryService
+    .metricsViewRows(
+      MetricsViewRowsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewRowsResponse);
 }
 
 export function getQueryServiceMetricsViewRowsQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<MetricsViewRowsRequest>, "instanceId">,
+  request?: Omit<V1MetricsViewRowsRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -421,16 +481,16 @@ export function getQueryServiceMetricsViewRowsQueryKey(
 
 export function getQueryServiceMetricsViewRowsQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewRowsRequest>, "instanceId">,
+  request: Omit<V1MetricsViewRowsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewRowsResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewRowsResponse>>;
   },
-): CreateQueryOptions<MetricsViewRowsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewRowsResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceMetricsViewRowsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewRowsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1MetricsViewRowsResponse> = ({ signal }) =>
     queryServiceMetricsViewRows(client, request, { signal });
   return {
     queryKey,
@@ -442,12 +502,12 @@ export function getQueryServiceMetricsViewRowsQueryOptions(
 
 export function createQueryServiceMetricsViewRows(
   client: RuntimeClient,
-  request: Omit<PartialMessage<MetricsViewRowsRequest>, "instanceId">,
+  request: Omit<V1MetricsViewRowsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewRowsResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewRowsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewRowsResponse> {
+): CreateQueryResult<V1MetricsViewRowsResponse> {
   const queryOptions = getQueryServiceMetricsViewRowsQueryOptions(
     client,
     request,
@@ -463,11 +523,16 @@ export function queryServiceMetricsViewTimeRange(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewTimeRangeResponse> {
-  return client.queryService.metricsViewTimeRange(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewTimeRangeResponse> {
+  return client.queryService
+    .metricsViewTimeRange(
+      MetricsViewTimeRangeRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewTimeRangeResponse);
 }
 
 export function getQueryServiceMetricsViewTimeRangeQueryKey(
@@ -486,14 +551,14 @@ export function getQueryServiceMetricsViewTimeRangeQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewTimeRangeResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewTimeRangeResponse>>;
   },
-): CreateQueryOptions<MetricsViewTimeRangeResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewTimeRangeResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceMetricsViewTimeRangeQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewTimeRangeResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1MetricsViewTimeRangeResponse> = ({ signal }) =>
     queryServiceMetricsViewTimeRange(client, request, { signal });
   return {
     queryKey,
@@ -507,10 +572,10 @@ export function createQueryServiceMetricsViewTimeRange(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewTimeRangeResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewTimeRangeResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewTimeRangeResponse> {
+): CreateQueryResult<V1MetricsViewTimeRangeResponse> {
   const queryOptions = getQueryServiceMetricsViewTimeRangeQueryOptions(
     client,
     request,
@@ -526,11 +591,16 @@ export function queryServiceMetricsViewSchema(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewSchemaResponse> {
-  return client.queryService.metricsViewSchema(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewSchemaResponse> {
+  return client.queryService
+    .metricsViewSchema(
+      MetricsViewSchemaRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewSchemaResponse);
 }
 
 export function getQueryServiceMetricsViewSchemaQueryKey(
@@ -549,14 +619,14 @@ export function getQueryServiceMetricsViewSchemaQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewSchemaResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewSchemaResponse>>;
   },
-): CreateQueryOptions<MetricsViewSchemaResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewSchemaResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceMetricsViewSchemaQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewSchemaResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1MetricsViewSchemaResponse> = ({ signal }) =>
     queryServiceMetricsViewSchema(client, request, { signal });
   return {
     queryKey,
@@ -570,10 +640,10 @@ export function createQueryServiceMetricsViewSchema(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewSchemaResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewSchemaResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewSchemaResponse> {
+): CreateQueryResult<V1MetricsViewSchemaResponse> {
   const queryOptions = getQueryServiceMetricsViewSchemaQueryOptions(
     client,
     request,
@@ -589,11 +659,16 @@ export function queryServiceMetricsViewSearch(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewSearchResponse> {
-  return client.queryService.metricsViewSearch(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewSearchResponse> {
+  return client.queryService
+    .metricsViewSearch(
+      MetricsViewSearchRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewSearchResponse);
 }
 
 export function getQueryServiceMetricsViewSearchQueryKey(
@@ -612,14 +687,14 @@ export function getQueryServiceMetricsViewSearchQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewSearchResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewSearchResponse>>;
   },
-): CreateQueryOptions<MetricsViewSearchResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewSearchResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceMetricsViewSearchQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewSearchResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1MetricsViewSearchResponse> = ({ signal }) =>
     queryServiceMetricsViewSearch(client, request, { signal });
   return {
     queryKey,
@@ -633,10 +708,10 @@ export function createQueryServiceMetricsViewSearch(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewSearchResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewSearchResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewSearchResponse> {
+): CreateQueryResult<V1MetricsViewSearchResponse> {
   const queryOptions = getQueryServiceMetricsViewSearchQueryOptions(
     client,
     request,
@@ -652,11 +727,16 @@ export function queryServiceMetricsViewTimeRanges(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewTimeRangesResponse> {
-  return client.queryService.metricsViewTimeRanges(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewTimeRangesResponse> {
+  return client.queryService
+    .metricsViewTimeRanges(
+      MetricsViewTimeRangesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewTimeRangesResponse);
 }
 
 export function getQueryServiceMetricsViewTimeRangesQueryKey(
@@ -675,15 +755,18 @@ export function getQueryServiceMetricsViewTimeRangesQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewTimeRangesResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewTimeRangesResponse>>;
   },
-): CreateQueryOptions<MetricsViewTimeRangesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewTimeRangesResponse> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewTimeRangesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewTimeRangesResponse> = ({ signal }) =>
-    queryServiceMetricsViewTimeRanges(client, request, { signal });
+  const queryFn: QueryFunction<V1MetricsViewTimeRangesResponse> = ({
+    signal,
+  }) => queryServiceMetricsViewTimeRanges(client, request, { signal });
   return {
     queryKey,
     queryFn,
@@ -696,10 +779,10 @@ export function createQueryServiceMetricsViewTimeRanges(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewTimeRangesResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewTimeRangesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewTimeRangesResponse> {
+): CreateQueryResult<V1MetricsViewTimeRangesResponse> {
   const queryOptions = getQueryServiceMetricsViewTimeRangesQueryOptions(
     client,
     request,
@@ -715,11 +798,16 @@ export function queryServiceMetricsViewAnnotations(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<MetricsViewAnnotationsResponse> {
-  return client.queryService.metricsViewAnnotations(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1MetricsViewAnnotationsResponse> {
+  return client.queryService
+    .metricsViewAnnotations(
+      MetricsViewAnnotationsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1MetricsViewAnnotationsResponse);
 }
 
 export function getQueryServiceMetricsViewAnnotationsQueryKey(
@@ -738,15 +826,18 @@ export function getQueryServiceMetricsViewAnnotationsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewAnnotationsResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewAnnotationsResponse>>;
   },
-): CreateQueryOptions<MetricsViewAnnotationsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewAnnotationsResponse> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewAnnotationsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<MetricsViewAnnotationsResponse> = ({ signal }) =>
-    queryServiceMetricsViewAnnotations(client, request, { signal });
+  const queryFn: QueryFunction<V1MetricsViewAnnotationsResponse> = ({
+    signal,
+  }) => queryServiceMetricsViewAnnotations(client, request, { signal });
   return {
     queryKey,
     queryFn,
@@ -759,10 +850,10 @@ export function createQueryServiceMetricsViewAnnotations(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<MetricsViewAnnotationsResponse>>;
+    query?: Partial<CreateQueryOptions<V1MetricsViewAnnotationsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<MetricsViewAnnotationsResponse> {
+): CreateQueryResult<V1MetricsViewAnnotationsResponse> {
   const queryOptions = getQueryServiceMetricsViewAnnotationsQueryOptions(
     client,
     request,
@@ -781,11 +872,18 @@ export function queryServiceConvertExpressionToMetricsSQL(
     "instanceId"
   >,
   options?: { signal?: AbortSignal },
-): Promise<ConvertExpressionToMetricsSQLResponse> {
-  return client.queryService.convertExpressionToMetricsSQL(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ConvertExpressionToMetricsSQLResponse> {
+  return client.queryService
+    .convertExpressionToMetricsSQL(
+      ConvertExpressionToMetricsSQLRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then(
+      (r) => r.toJson() as unknown as V1ConvertExpressionToMetricsSQLResponse,
+    );
 }
 
 export function getQueryServiceConvertExpressionToMetricsSQLQueryKey(
@@ -810,16 +908,18 @@ export function getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
     "instanceId"
   >,
   options?: {
-    query?: Partial<CreateQueryOptions<ConvertExpressionToMetricsSQLResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse>
+    >;
   },
-): CreateQueryOptions<ConvertExpressionToMetricsSQLResponse> & {
+): CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceConvertExpressionToMetricsSQLQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ConvertExpressionToMetricsSQLResponse> = ({
+  const queryFn: QueryFunction<V1ConvertExpressionToMetricsSQLResponse> = ({
     signal,
   }) => queryServiceConvertExpressionToMetricsSQL(client, request, { signal });
   return {
@@ -837,10 +937,12 @@ export function createQueryServiceConvertExpressionToMetricsSQL(
     "instanceId"
   >,
   options?: {
-    query?: Partial<CreateQueryOptions<ConvertExpressionToMetricsSQLResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ConvertExpressionToMetricsSQLResponse> {
+): CreateQueryResult<V1ConvertExpressionToMetricsSQLResponse> {
   const queryOptions = getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
     client,
     request,
@@ -856,11 +958,16 @@ export function queryServiceResolveCanvas(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ResolveCanvasResponse> {
-  return client.queryService.resolveCanvas(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ResolveCanvasResponse> {
+  return client.queryService
+    .resolveCanvas(
+      ResolveCanvasRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ResolveCanvasResponse);
 }
 
 export function getQueryServiceResolveCanvasQueryKey(
@@ -874,14 +981,14 @@ export function getQueryServiceResolveCanvasQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ResolveCanvasResponse>>;
+    query?: Partial<CreateQueryOptions<V1ResolveCanvasResponse>>;
   },
-): CreateQueryOptions<ResolveCanvasResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ResolveCanvasResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceResolveCanvasQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ResolveCanvasResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ResolveCanvasResponse> = ({ signal }) =>
     queryServiceResolveCanvas(client, request, { signal });
   return {
     queryKey,
@@ -895,10 +1002,10 @@ export function createQueryServiceResolveCanvas(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ResolveCanvasResponse>>;
+    query?: Partial<CreateQueryOptions<V1ResolveCanvasResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ResolveCanvasResponse> {
+): CreateQueryResult<V1ResolveCanvasResponse> {
   const queryOptions = getQueryServiceResolveCanvasQueryOptions(
     client,
     request,
@@ -914,11 +1021,16 @@ export function queryServiceResolveComponent(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ResolveComponentResponse> {
-  return client.queryService.resolveComponent(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ResolveComponentResponse> {
+  return client.queryService
+    .resolveComponent(
+      ResolveComponentRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ResolveComponentResponse);
 }
 
 export function getQueryServiceResolveComponentQueryKey(
@@ -937,14 +1049,14 @@ export function getQueryServiceResolveComponentQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ResolveComponentResponse>>;
+    query?: Partial<CreateQueryOptions<V1ResolveComponentResponse>>;
   },
-): CreateQueryOptions<ResolveComponentResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ResolveComponentResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceResolveComponentQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ResolveComponentResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ResolveComponentResponse> = ({ signal }) =>
     queryServiceResolveComponent(client, request, { signal });
   return {
     queryKey,
@@ -958,10 +1070,10 @@ export function createQueryServiceResolveComponent(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ResolveComponentResponse>>;
+    query?: Partial<CreateQueryOptions<V1ResolveComponentResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ResolveComponentResponse> {
+): CreateQueryResult<V1ResolveComponentResponse> {
   const queryOptions = getQueryServiceResolveComponentQueryOptions(
     client,
     request,
@@ -977,11 +1089,16 @@ export function queryServiceResolveTemplatedString(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ResolveTemplatedStringResponse> {
-  return client.queryService.resolveTemplatedString(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ResolveTemplatedStringResponse> {
+  return client.queryService
+    .resolveTemplatedString(
+      ResolveTemplatedStringRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ResolveTemplatedStringResponse);
 }
 
 export function getQueryServiceResolveTemplatedStringQueryKey(
@@ -1000,15 +1117,18 @@ export function getQueryServiceResolveTemplatedStringQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ResolveTemplatedStringResponse>>;
+    query?: Partial<CreateQueryOptions<V1ResolveTemplatedStringResponse>>;
   },
-): CreateQueryOptions<ResolveTemplatedStringResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ResolveTemplatedStringResponse> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceResolveTemplatedStringQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ResolveTemplatedStringResponse> = ({ signal }) =>
-    queryServiceResolveTemplatedString(client, request, { signal });
+  const queryFn: QueryFunction<V1ResolveTemplatedStringResponse> = ({
+    signal,
+  }) => queryServiceResolveTemplatedString(client, request, { signal });
   return {
     queryKey,
     queryFn,
@@ -1021,10 +1141,10 @@ export function createQueryServiceResolveTemplatedString(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ResolveTemplatedStringResponse>>;
+    query?: Partial<CreateQueryOptions<V1ResolveTemplatedStringResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ResolveTemplatedStringResponse> {
+): CreateQueryResult<V1ResolveTemplatedStringResponse> {
   const queryOptions = getQueryServiceResolveTemplatedStringQueryOptions(
     client,
     request,
@@ -1038,18 +1158,23 @@ export function createQueryServiceResolveTemplatedString(
  */
 export function queryServiceColumnRollupInterval(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnRollupIntervalRequest>, "instanceId">,
+  request: Omit<V1ColumnRollupIntervalRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnRollupIntervalResponse> {
-  return client.queryService.columnRollupInterval(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnRollupIntervalResponse> {
+  return client.queryService
+    .columnRollupInterval(
+      ColumnRollupIntervalRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnRollupIntervalResponse);
 }
 
 export function getQueryServiceColumnRollupIntervalQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnRollupIntervalRequest>, "instanceId">,
+  request?: Omit<V1ColumnRollupIntervalRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1061,16 +1186,16 @@ export function getQueryServiceColumnRollupIntervalQueryKey(
 
 export function getQueryServiceColumnRollupIntervalQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnRollupIntervalRequest>, "instanceId">,
+  request: Omit<V1ColumnRollupIntervalRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnRollupIntervalResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnRollupIntervalResponse>>;
   },
-): CreateQueryOptions<ColumnRollupIntervalResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnRollupIntervalResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceColumnRollupIntervalQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnRollupIntervalResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ColumnRollupIntervalResponse> = ({ signal }) =>
     queryServiceColumnRollupInterval(client, request, { signal });
   return {
     queryKey,
@@ -1082,12 +1207,12 @@ export function getQueryServiceColumnRollupIntervalQueryOptions(
 
 export function createQueryServiceColumnRollupInterval(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnRollupIntervalRequest>, "instanceId">,
+  request: Omit<V1ColumnRollupIntervalRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnRollupIntervalResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnRollupIntervalResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnRollupIntervalResponse> {
+): CreateQueryResult<V1ColumnRollupIntervalResponse> {
   const queryOptions = getQueryServiceColumnRollupIntervalQueryOptions(
     client,
     request,
@@ -1101,34 +1226,39 @@ export function createQueryServiceColumnRollupInterval(
  */
 export function queryServiceColumnTopK(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTopKRequest>, "instanceId">,
+  request: Omit<V1ColumnTopKRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnTopKResponse> {
-  return client.queryService.columnTopK(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnTopKResponse> {
+  return client.queryService
+    .columnTopK(
+      ColumnTopKRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnTopKResponse);
 }
 
 export function getQueryServiceColumnTopKQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnTopKRequest>, "instanceId">,
+  request?: Omit<V1ColumnTopKRequest, "instanceId">,
 ): QueryKey {
   return ["QueryService", "columnTopK", instanceId, request ?? {}] as const;
 }
 
 export function getQueryServiceColumnTopKQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTopKRequest>, "instanceId">,
+  request: Omit<V1ColumnTopKRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnTopKResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTopKResponse>>;
   },
-): CreateQueryOptions<ColumnTopKResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnTopKResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceColumnTopKQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnTopKResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ColumnTopKResponse> = ({ signal }) =>
     queryServiceColumnTopK(client, request, { signal });
   return {
     queryKey,
@@ -1140,12 +1270,12 @@ export function getQueryServiceColumnTopKQueryOptions(
 
 export function createQueryServiceColumnTopK(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTopKRequest>, "instanceId">,
+  request: Omit<V1ColumnTopKRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnTopKResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTopKResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnTopKResponse> {
+): CreateQueryResult<V1ColumnTopKResponse> {
   const queryOptions = getQueryServiceColumnTopKQueryOptions(
     client,
     request,
@@ -1159,18 +1289,23 @@ export function createQueryServiceColumnTopK(
  */
 export function queryServiceColumnNullCount(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnNullCountRequest>, "instanceId">,
+  request: Omit<V1ColumnNullCountRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnNullCountResponse> {
-  return client.queryService.columnNullCount(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnNullCountResponse> {
+  return client.queryService
+    .columnNullCount(
+      ColumnNullCountRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnNullCountResponse);
 }
 
 export function getQueryServiceColumnNullCountQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnNullCountRequest>, "instanceId">,
+  request?: Omit<V1ColumnNullCountRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1182,16 +1317,16 @@ export function getQueryServiceColumnNullCountQueryKey(
 
 export function getQueryServiceColumnNullCountQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnNullCountRequest>, "instanceId">,
+  request: Omit<V1ColumnNullCountRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnNullCountResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnNullCountResponse>>;
   },
-): CreateQueryOptions<ColumnNullCountResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnNullCountResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceColumnNullCountQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnNullCountResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ColumnNullCountResponse> = ({ signal }) =>
     queryServiceColumnNullCount(client, request, { signal });
   return {
     queryKey,
@@ -1203,12 +1338,12 @@ export function getQueryServiceColumnNullCountQueryOptions(
 
 export function createQueryServiceColumnNullCount(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnNullCountRequest>, "instanceId">,
+  request: Omit<V1ColumnNullCountRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnNullCountResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnNullCountResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnNullCountResponse> {
+): CreateQueryResult<V1ColumnNullCountResponse> {
   const queryOptions = getQueryServiceColumnNullCountQueryOptions(
     client,
     request,
@@ -1222,24 +1357,25 @@ export function createQueryServiceColumnNullCount(
  */
 export function queryServiceColumnDescriptiveStatistics(
   client: RuntimeClient,
-  request: Omit<
-    PartialMessage<ColumnDescriptiveStatisticsRequest>,
-    "instanceId"
-  >,
+  request: Omit<V1ColumnDescriptiveStatisticsRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnDescriptiveStatisticsResponse> {
-  return client.queryService.columnDescriptiveStatistics(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnDescriptiveStatisticsResponse> {
+  return client.queryService
+    .columnDescriptiveStatistics(
+      ColumnDescriptiveStatisticsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then(
+      (r) => r.toJson() as unknown as V1ColumnDescriptiveStatisticsResponse,
+    );
 }
 
 export function getQueryServiceColumnDescriptiveStatisticsQueryKey(
   instanceId: string,
-  request?: Omit<
-    PartialMessage<ColumnDescriptiveStatisticsRequest>,
-    "instanceId"
-  >,
+  request?: Omit<V1ColumnDescriptiveStatisticsRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1251,21 +1387,18 @@ export function getQueryServiceColumnDescriptiveStatisticsQueryKey(
 
 export function getQueryServiceColumnDescriptiveStatisticsQueryOptions(
   client: RuntimeClient,
-  request: Omit<
-    PartialMessage<ColumnDescriptiveStatisticsRequest>,
-    "instanceId"
-  >,
+  request: Omit<V1ColumnDescriptiveStatisticsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnDescriptiveStatisticsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse>>;
   },
-): CreateQueryOptions<ColumnDescriptiveStatisticsResponse> & {
+): CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceColumnDescriptiveStatisticsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnDescriptiveStatisticsResponse> = ({
+  const queryFn: QueryFunction<V1ColumnDescriptiveStatisticsResponse> = ({
     signal,
   }) => queryServiceColumnDescriptiveStatistics(client, request, { signal });
   return {
@@ -1278,15 +1411,12 @@ export function getQueryServiceColumnDescriptiveStatisticsQueryOptions(
 
 export function createQueryServiceColumnDescriptiveStatistics(
   client: RuntimeClient,
-  request: Omit<
-    PartialMessage<ColumnDescriptiveStatisticsRequest>,
-    "instanceId"
-  >,
+  request: Omit<V1ColumnDescriptiveStatisticsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnDescriptiveStatisticsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnDescriptiveStatisticsResponse> {
+): CreateQueryResult<V1ColumnDescriptiveStatisticsResponse> {
   const queryOptions = getQueryServiceColumnDescriptiveStatisticsQueryOptions(
     client,
     request,
@@ -1300,18 +1430,23 @@ export function createQueryServiceColumnDescriptiveStatistics(
  */
 export function queryServiceColumnTimeGrain(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeGrainRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeGrainRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnTimeGrainResponse> {
-  return client.queryService.columnTimeGrain(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnTimeGrainResponse> {
+  return client.queryService
+    .columnTimeGrain(
+      ColumnTimeGrainRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnTimeGrainResponse);
 }
 
 export function getQueryServiceColumnTimeGrainQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnTimeGrainRequest>, "instanceId">,
+  request?: Omit<V1ColumnTimeGrainRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1323,16 +1458,16 @@ export function getQueryServiceColumnTimeGrainQueryKey(
 
 export function getQueryServiceColumnTimeGrainQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeGrainRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeGrainRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnTimeGrainResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTimeGrainResponse>>;
   },
-): CreateQueryOptions<ColumnTimeGrainResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnTimeGrainResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceColumnTimeGrainQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnTimeGrainResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ColumnTimeGrainResponse> = ({ signal }) =>
     queryServiceColumnTimeGrain(client, request, { signal });
   return {
     queryKey,
@@ -1344,12 +1479,12 @@ export function getQueryServiceColumnTimeGrainQueryOptions(
 
 export function createQueryServiceColumnTimeGrain(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeGrainRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeGrainRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnTimeGrainResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTimeGrainResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnTimeGrainResponse> {
+): CreateQueryResult<V1ColumnTimeGrainResponse> {
   const queryOptions = getQueryServiceColumnTimeGrainQueryOptions(
     client,
     request,
@@ -1363,18 +1498,23 @@ export function createQueryServiceColumnTimeGrain(
  */
 export function queryServiceColumnNumericHistogram(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnNumericHistogramRequest>, "instanceId">,
+  request: Omit<V1ColumnNumericHistogramRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnNumericHistogramResponse> {
-  return client.queryService.columnNumericHistogram(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnNumericHistogramResponse> {
+  return client.queryService
+    .columnNumericHistogram(
+      ColumnNumericHistogramRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnNumericHistogramResponse);
 }
 
 export function getQueryServiceColumnNumericHistogramQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnNumericHistogramRequest>, "instanceId">,
+  request?: Omit<V1ColumnNumericHistogramRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1386,17 +1526,20 @@ export function getQueryServiceColumnNumericHistogramQueryKey(
 
 export function getQueryServiceColumnNumericHistogramQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnNumericHistogramRequest>, "instanceId">,
+  request: Omit<V1ColumnNumericHistogramRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnNumericHistogramResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnNumericHistogramResponse>>;
   },
-): CreateQueryOptions<ColumnNumericHistogramResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnNumericHistogramResponse> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnNumericHistogramQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnNumericHistogramResponse> = ({ signal }) =>
-    queryServiceColumnNumericHistogram(client, request, { signal });
+  const queryFn: QueryFunction<V1ColumnNumericHistogramResponse> = ({
+    signal,
+  }) => queryServiceColumnNumericHistogram(client, request, { signal });
   return {
     queryKey,
     queryFn,
@@ -1407,12 +1550,12 @@ export function getQueryServiceColumnNumericHistogramQueryOptions(
 
 export function createQueryServiceColumnNumericHistogram(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnNumericHistogramRequest>, "instanceId">,
+  request: Omit<V1ColumnNumericHistogramRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnNumericHistogramResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnNumericHistogramResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnNumericHistogramResponse> {
+): CreateQueryResult<V1ColumnNumericHistogramResponse> {
   const queryOptions = getQueryServiceColumnNumericHistogramQueryOptions(
     client,
     request,
@@ -1426,18 +1569,23 @@ export function createQueryServiceColumnNumericHistogram(
  */
 export function queryServiceColumnRugHistogram(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnRugHistogramRequest>, "instanceId">,
+  request: Omit<V1ColumnRugHistogramRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnRugHistogramResponse> {
-  return client.queryService.columnRugHistogram(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnRugHistogramResponse> {
+  return client.queryService
+    .columnRugHistogram(
+      ColumnRugHistogramRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnRugHistogramResponse);
 }
 
 export function getQueryServiceColumnRugHistogramQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnRugHistogramRequest>, "instanceId">,
+  request?: Omit<V1ColumnRugHistogramRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1449,16 +1597,16 @@ export function getQueryServiceColumnRugHistogramQueryKey(
 
 export function getQueryServiceColumnRugHistogramQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnRugHistogramRequest>, "instanceId">,
+  request: Omit<V1ColumnRugHistogramRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnRugHistogramResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnRugHistogramResponse>>;
   },
-): CreateQueryOptions<ColumnRugHistogramResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnRugHistogramResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceColumnRugHistogramQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnRugHistogramResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ColumnRugHistogramResponse> = ({ signal }) =>
     queryServiceColumnRugHistogram(client, request, { signal });
   return {
     queryKey,
@@ -1470,12 +1618,12 @@ export function getQueryServiceColumnRugHistogramQueryOptions(
 
 export function createQueryServiceColumnRugHistogram(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnRugHistogramRequest>, "instanceId">,
+  request: Omit<V1ColumnRugHistogramRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnRugHistogramResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnRugHistogramResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnRugHistogramResponse> {
+): CreateQueryResult<V1ColumnRugHistogramResponse> {
   const queryOptions = getQueryServiceColumnRugHistogramQueryOptions(
     client,
     request,
@@ -1489,18 +1637,23 @@ export function createQueryServiceColumnRugHistogram(
  */
 export function queryServiceColumnTimeRange(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeRangeRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeRangeRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnTimeRangeResponse> {
-  return client.queryService.columnTimeRange(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnTimeRangeResponse> {
+  return client.queryService
+    .columnTimeRange(
+      ColumnTimeRangeRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnTimeRangeResponse);
 }
 
 export function getQueryServiceColumnTimeRangeQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnTimeRangeRequest>, "instanceId">,
+  request?: Omit<V1ColumnTimeRangeRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1512,16 +1665,16 @@ export function getQueryServiceColumnTimeRangeQueryKey(
 
 export function getQueryServiceColumnTimeRangeQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeRangeRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeRangeRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnTimeRangeResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTimeRangeResponse>>;
   },
-): CreateQueryOptions<ColumnTimeRangeResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnTimeRangeResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceColumnTimeRangeQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnTimeRangeResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ColumnTimeRangeResponse> = ({ signal }) =>
     queryServiceColumnTimeRange(client, request, { signal });
   return {
     queryKey,
@@ -1533,12 +1686,12 @@ export function getQueryServiceColumnTimeRangeQueryOptions(
 
 export function createQueryServiceColumnTimeRange(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeRangeRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeRangeRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnTimeRangeResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTimeRangeResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnTimeRangeResponse> {
+): CreateQueryResult<V1ColumnTimeRangeResponse> {
   const queryOptions = getQueryServiceColumnTimeRangeQueryOptions(
     client,
     request,
@@ -1552,18 +1705,23 @@ export function createQueryServiceColumnTimeRange(
  */
 export function queryServiceColumnCardinality(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnCardinalityRequest>, "instanceId">,
+  request: Omit<V1ColumnCardinalityRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnCardinalityResponse> {
-  return client.queryService.columnCardinality(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnCardinalityResponse> {
+  return client.queryService
+    .columnCardinality(
+      ColumnCardinalityRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnCardinalityResponse);
 }
 
 export function getQueryServiceColumnCardinalityQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnCardinalityRequest>, "instanceId">,
+  request?: Omit<V1ColumnCardinalityRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1575,16 +1733,16 @@ export function getQueryServiceColumnCardinalityQueryKey(
 
 export function getQueryServiceColumnCardinalityQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnCardinalityRequest>, "instanceId">,
+  request: Omit<V1ColumnCardinalityRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnCardinalityResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnCardinalityResponse>>;
   },
-): CreateQueryOptions<ColumnCardinalityResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnCardinalityResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceColumnCardinalityQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnCardinalityResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ColumnCardinalityResponse> = ({ signal }) =>
     queryServiceColumnCardinality(client, request, { signal });
   return {
     queryKey,
@@ -1596,12 +1754,12 @@ export function getQueryServiceColumnCardinalityQueryOptions(
 
 export function createQueryServiceColumnCardinality(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnCardinalityRequest>, "instanceId">,
+  request: Omit<V1ColumnCardinalityRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnCardinalityResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnCardinalityResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnCardinalityResponse> {
+): CreateQueryResult<V1ColumnCardinalityResponse> {
   const queryOptions = getQueryServiceColumnCardinalityQueryOptions(
     client,
     request,
@@ -1615,18 +1773,23 @@ export function createQueryServiceColumnCardinality(
  */
 export function queryServiceColumnTimeSeries(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeSeriesRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeSeriesRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ColumnTimeSeriesResponse> {
-  return client.queryService.columnTimeSeries(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ColumnTimeSeriesResponse> {
+  return client.queryService
+    .columnTimeSeries(
+      ColumnTimeSeriesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ColumnTimeSeriesResponse);
 }
 
 export function getQueryServiceColumnTimeSeriesQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<ColumnTimeSeriesRequest>, "instanceId">,
+  request?: Omit<V1ColumnTimeSeriesRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1638,16 +1801,16 @@ export function getQueryServiceColumnTimeSeriesQueryKey(
 
 export function getQueryServiceColumnTimeSeriesQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeSeriesRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeSeriesRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnTimeSeriesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTimeSeriesResponse>>;
   },
-): CreateQueryOptions<ColumnTimeSeriesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnTimeSeriesResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceColumnTimeSeriesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ColumnTimeSeriesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ColumnTimeSeriesResponse> = ({ signal }) =>
     queryServiceColumnTimeSeries(client, request, { signal });
   return {
     queryKey,
@@ -1659,12 +1822,12 @@ export function getQueryServiceColumnTimeSeriesQueryOptions(
 
 export function createQueryServiceColumnTimeSeries(
   client: RuntimeClient,
-  request: Omit<PartialMessage<ColumnTimeSeriesRequest>, "instanceId">,
+  request: Omit<V1ColumnTimeSeriesRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ColumnTimeSeriesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTimeSeriesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ColumnTimeSeriesResponse> {
+): CreateQueryResult<V1ColumnTimeSeriesResponse> {
   const queryOptions = getQueryServiceColumnTimeSeriesQueryOptions(
     client,
     request,
@@ -1678,18 +1841,23 @@ export function createQueryServiceColumnTimeSeries(
  */
 export function queryServiceTableCardinality(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableCardinalityRequest>, "instanceId">,
+  request: Omit<V1TableCardinalityRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<TableCardinalityResponse> {
-  return client.queryService.tableCardinality(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1TableCardinalityResponse> {
+  return client.queryService
+    .tableCardinality(
+      TableCardinalityRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1TableCardinalityResponse);
 }
 
 export function getQueryServiceTableCardinalityQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<TableCardinalityRequest>, "instanceId">,
+  request?: Omit<V1TableCardinalityRequest, "instanceId">,
 ): QueryKey {
   return [
     "QueryService",
@@ -1701,16 +1869,16 @@ export function getQueryServiceTableCardinalityQueryKey(
 
 export function getQueryServiceTableCardinalityQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableCardinalityRequest>, "instanceId">,
+  request: Omit<V1TableCardinalityRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<TableCardinalityResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableCardinalityResponse>>;
   },
-): CreateQueryOptions<TableCardinalityResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1TableCardinalityResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceTableCardinalityQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<TableCardinalityResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1TableCardinalityResponse> = ({ signal }) =>
     queryServiceTableCardinality(client, request, { signal });
   return {
     queryKey,
@@ -1722,12 +1890,12 @@ export function getQueryServiceTableCardinalityQueryOptions(
 
 export function createQueryServiceTableCardinality(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableCardinalityRequest>, "instanceId">,
+  request: Omit<V1TableCardinalityRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<TableCardinalityResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableCardinalityResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<TableCardinalityResponse> {
+): CreateQueryResult<V1TableCardinalityResponse> {
   const queryOptions = getQueryServiceTableCardinalityQueryOptions(
     client,
     request,
@@ -1741,34 +1909,39 @@ export function createQueryServiceTableCardinality(
  */
 export function queryServiceTableColumns(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableColumnsRequest>, "instanceId">,
+  request: Omit<V1TableColumnsRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<TableColumnsResponse> {
-  return client.queryService.tableColumns(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1TableColumnsResponse> {
+  return client.queryService
+    .tableColumns(
+      TableColumnsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1TableColumnsResponse);
 }
 
 export function getQueryServiceTableColumnsQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<TableColumnsRequest>, "instanceId">,
+  request?: Omit<V1TableColumnsRequest, "instanceId">,
 ): QueryKey {
   return ["QueryService", "tableColumns", instanceId, request ?? {}] as const;
 }
 
 export function getQueryServiceTableColumnsQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableColumnsRequest>, "instanceId">,
+  request: Omit<V1TableColumnsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<TableColumnsResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableColumnsResponse>>;
   },
-): CreateQueryOptions<TableColumnsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1TableColumnsResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceTableColumnsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<TableColumnsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1TableColumnsResponse> = ({ signal }) =>
     queryServiceTableColumns(client, request, { signal });
   return {
     queryKey,
@@ -1780,12 +1953,12 @@ export function getQueryServiceTableColumnsQueryOptions(
 
 export function createQueryServiceTableColumns(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableColumnsRequest>, "instanceId">,
+  request: Omit<V1TableColumnsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<TableColumnsResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableColumnsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<TableColumnsResponse> {
+): CreateQueryResult<V1TableColumnsResponse> {
   const queryOptions = getQueryServiceTableColumnsQueryOptions(
     client,
     request,
@@ -1799,31 +1972,36 @@ export function createQueryServiceTableColumns(
  */
 export function queryServiceTableRows(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableRowsRequest>, "instanceId">,
+  request: Omit<V1TableRowsRequest, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<TableRowsResponse> {
-  return client.queryService.tableRows(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1TableRowsResponse> {
+  return client.queryService
+    .tableRows(
+      TableRowsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1TableRowsResponse);
 }
 
 export function getQueryServiceTableRowsQueryKey(
   instanceId: string,
-  request?: Omit<PartialMessage<TableRowsRequest>, "instanceId">,
+  request?: Omit<V1TableRowsRequest, "instanceId">,
 ): QueryKey {
   return ["QueryService", "tableRows", instanceId, request ?? {}] as const;
 }
 
 export function getQueryServiceTableRowsQueryOptions(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableRowsRequest>, "instanceId">,
+  request: Omit<V1TableRowsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<TableRowsResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableRowsResponse>>;
   },
-): CreateQueryOptions<TableRowsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1TableRowsResponse> & { queryKey: QueryKey } {
   const queryKey = getQueryServiceTableRowsQueryKey(client.instanceId, request);
-  const queryFn: QueryFunction<TableRowsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1TableRowsResponse> = ({ signal }) =>
     queryServiceTableRows(client, request, { signal });
   return {
     queryKey,
@@ -1835,12 +2013,12 @@ export function getQueryServiceTableRowsQueryOptions(
 
 export function createQueryServiceTableRows(
   client: RuntimeClient,
-  request: Omit<PartialMessage<TableRowsRequest>, "instanceId">,
+  request: Omit<V1TableRowsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<TableRowsResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableRowsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<TableRowsResponse> {
+): CreateQueryResult<V1TableRowsResponse> {
   const queryOptions = getQueryServiceTableRowsQueryOptions(
     client,
     request,
@@ -1855,24 +2033,28 @@ export function createQueryServiceTableRows(
 export function queryServiceQuery(
   client: RuntimeClient,
   request: Omit<PartialMessage<QueryRequest>, "instanceId">,
-): Promise<QueryResponse> {
-  return client.queryService.query({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1QueryResponse> {
+  return client.queryService
+    .query(
+      QueryRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1QueryResponse);
 }
 
 export function getQueryServiceQueryMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      QueryResponse,
+      V1QueryResponse,
       unknown,
       Omit<PartialMessage<QueryRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  QueryResponse,
+  V1QueryResponse,
   unknown,
   Omit<PartialMessage<QueryRequest>, "instanceId">
 > {
@@ -1886,14 +2068,14 @@ export function createQueryServiceQueryMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      QueryResponse,
+      V1QueryResponse,
       unknown,
       Omit<PartialMessage<QueryRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  QueryResponse,
+  V1QueryResponse,
   unknown,
   Omit<PartialMessage<QueryRequest>, "instanceId">
 > {
@@ -1907,24 +2089,28 @@ export function createQueryServiceQueryMutation(
 export function queryServiceExport(
   client: RuntimeClient,
   request: Omit<PartialMessage<ExportRequest>, "instanceId">,
-): Promise<ExportResponse> {
-  return client.queryService.export({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1ExportResponse> {
+  return client.queryService
+    .export(
+      ExportRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1ExportResponse);
 }
 
 export function getQueryServiceExportMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ExportResponse,
+      V1ExportResponse,
       unknown,
       Omit<PartialMessage<ExportRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  ExportResponse,
+  V1ExportResponse,
   unknown,
   Omit<PartialMessage<ExportRequest>, "instanceId">
 > {
@@ -1938,14 +2124,14 @@ export function createQueryServiceExportMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ExportResponse,
+      V1ExportResponse,
       unknown,
       Omit<PartialMessage<ExportRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  ExportResponse,
+  V1ExportResponse,
   unknown,
   Omit<PartialMessage<ExportRequest>, "instanceId">
 > {
@@ -1959,24 +2145,28 @@ export function createQueryServiceExportMutation(
 export function queryServiceExportReport(
   client: RuntimeClient,
   request: Omit<PartialMessage<ExportReportRequest>, "instanceId">,
-): Promise<ExportReportResponse> {
-  return client.queryService.exportReport({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1ExportReportResponse> {
+  return client.queryService
+    .exportReport(
+      ExportReportRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1ExportReportResponse);
 }
 
 export function getQueryServiceExportReportMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ExportReportResponse,
+      V1ExportReportResponse,
       unknown,
       Omit<PartialMessage<ExportReportRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  ExportReportResponse,
+  V1ExportReportResponse,
   unknown,
   Omit<PartialMessage<ExportReportRequest>, "instanceId">
 > {
@@ -1990,14 +2180,14 @@ export function createQueryServiceExportReportMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ExportReportResponse,
+      V1ExportReportResponse,
       unknown,
       Omit<PartialMessage<ExportReportRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  ExportReportResponse,
+  V1ExportReportResponse,
   unknown,
   Omit<PartialMessage<ExportReportRequest>, "instanceId">
 > {
diff --git a/web-common/src/runtime-client/v2/gen/runtime-service.ts b/web-common/src/runtime-client/v2/gen/runtime-service.ts
index 9eec39ca3d7..fee8fd98ab3 100644
--- a/web-common/src/runtime-client/v2/gen/runtime-service.ts
+++ b/web-common/src/runtime-client/v2/gen/runtime-service.ts
@@ -1,7 +1,7 @@
 // Generated by generate-query-hooks.ts — DO NOT EDIT
 
 import type { RuntimeClient } from "../runtime-client";
-import type { PartialMessage } from "@bufbuild/protobuf";
+import type { PartialMessage, JsonValue } from "@bufbuild/protobuf";
 import {
   createQuery,
   createMutation,
@@ -13,105 +13,109 @@ import {
   type CreateMutationOptions,
   type CreateMutationResult,
 } from "@tanstack/svelte-query";
+import type {
+  V1AnalyzeConnectorsResponse,
+  V1AnalyzeVariablesResponse,
+  V1CompleteResponse,
+  V1CreateDirectoryResponse,
+  V1CreateInstanceRequest,
+  V1CreateInstanceResponse,
+  V1CreateTriggerResponse,
+  V1DeleteFileResponse,
+  V1DeleteInstanceResponse,
+  V1EditInstanceResponse,
+  V1ForkConversationResponse,
+  V1GenerateCanvasFileResponse,
+  V1GenerateMetricsViewFileResponse,
+  V1GenerateRendererResponse,
+  V1GenerateResolverResponse,
+  V1GetConversationResponse,
+  V1GetExploreResponse,
+  V1GetFileResponse,
+  V1GetInstanceResponse,
+  V1GetLogsResponse,
+  V1GetModelPartitionsResponse,
+  V1GetResourceResponse,
+  V1GitCommitResponse,
+  V1GitMergeToBranchResponse,
+  V1GitPullResponse,
+  V1GitPushResponse,
+  V1GitStatusResponse,
+  V1GitSwitchBranchResponse,
+  V1HealthResponse,
+  V1InstanceHealthResponse,
+  V1IssueDevJWTRequest,
+  V1IssueDevJWTResponse,
+  V1ListConnectorDriversResponse,
+  V1ListConversationsResponse,
+  V1ListExamplesResponse,
+  V1ListFilesResponse,
+  V1ListGitBranchesResponse,
+  V1ListGitCommitsResponse,
+  V1ListInstancesResponse,
+  V1ListNotifierConnectorsResponse,
+  V1ListResourcesResponse,
+  V1ListToolsResponse,
+  V1PingResponse,
+  V1PutFileResponse,
+  V1QueryResolverResponse,
+  V1ReloadConfigResponse,
+  V1RenameFileResponse,
+  V1RestoreGitCommitResponse,
+  V1ShareConversationResponse,
+  V1UnpackEmptyResponse,
+  V1UnpackExampleResponse,
+} from "../../gen/index.schemas";
 import {
   AnalyzeConnectorsRequest,
-  AnalyzeConnectorsResponse,
   AnalyzeVariablesRequest,
-  AnalyzeVariablesResponse,
   CompleteRequest,
-  CompleteResponse,
   CreateDirectoryRequest,
-  CreateDirectoryResponse,
   CreateInstanceRequest,
-  CreateInstanceResponse,
   CreateTriggerRequest,
-  CreateTriggerResponse,
   DeleteFileRequest,
-  DeleteFileResponse,
   DeleteInstanceRequest,
-  DeleteInstanceResponse,
   EditInstanceRequest,
-  EditInstanceResponse,
   ForkConversationRequest,
-  ForkConversationResponse,
   GenerateCanvasFileRequest,
-  GenerateCanvasFileResponse,
   GenerateMetricsViewFileRequest,
-  GenerateMetricsViewFileResponse,
   GenerateRendererRequest,
-  GenerateRendererResponse,
   GenerateResolverRequest,
-  GenerateResolverResponse,
   GetConversationRequest,
-  GetConversationResponse,
   GetExploreRequest,
-  GetExploreResponse,
   GetFileRequest,
-  GetFileResponse,
   GetInstanceRequest,
-  GetInstanceResponse,
   GetLogsRequest,
-  GetLogsResponse,
   GetModelPartitionsRequest,
-  GetModelPartitionsResponse,
   GetResourceRequest,
-  GetResourceResponse,
   GitCommitRequest,
-  GitCommitResponse,
   GitMergeToBranchRequest,
-  GitMergeToBranchResponse,
   GitPullRequest,
-  GitPullResponse,
   GitPushRequest,
-  GitPushResponse,
   GitStatusRequest,
-  GitStatusResponse,
   GitSwitchBranchRequest,
-  GitSwitchBranchResponse,
   HealthRequest,
-  HealthResponse,
   InstanceHealthRequest,
-  InstanceHealthResponse,
   IssueDevJWTRequest,
-  IssueDevJWTResponse,
   ListConnectorDriversRequest,
-  ListConnectorDriversResponse,
   ListConversationsRequest,
-  ListConversationsResponse,
   ListExamplesRequest,
-  ListExamplesResponse,
   ListFilesRequest,
-  ListFilesResponse,
   ListGitBranchesRequest,
-  ListGitBranchesResponse,
   ListGitCommitsRequest,
-  ListGitCommitsResponse,
   ListInstancesRequest,
-  ListInstancesResponse,
   ListNotifierConnectorsRequest,
-  ListNotifierConnectorsResponse,
   ListResourcesRequest,
-  ListResourcesResponse,
   ListToolsRequest,
-  ListToolsResponse,
   PingRequest,
-  PingResponse,
   PutFileRequest,
-  PutFileResponse,
   QueryResolverRequest,
-  QueryResolverResponse,
   ReloadConfigRequest,
-  ReloadConfigResponse,
   RenameFileRequest,
-  RenameFileResponse,
   RestoreGitCommitRequest,
-  RestoreGitCommitResponse,
   ShareConversationRequest,
-  ShareConversationResponse,
   UnpackEmptyRequest,
-  UnpackEmptyResponse,
   UnpackExampleRequest,
-  UnpackExampleResponse,
 } from "../../../proto/gen/rill/runtime/v1/api_pb";
 
 /**
@@ -121,8 +125,12 @@ export function runtimeServicePing(
   client: RuntimeClient,
   request: PartialMessage<PingRequest>,
   options?: { signal?: AbortSignal },
-): Promise<PingResponse> {
-  return client.runtimeService.ping(request, { signal: options?.signal });
+): Promise<V1PingResponse> {
+  return client.runtimeService
+    .ping(PingRequest.fromJson(request as unknown as JsonValue), {
+      signal: options?.signal,
+    })
+    .then((r) => r.toJson() as unknown as V1PingResponse);
 }
 
 export function getRuntimeServicePingQueryKey(
@@ -136,11 +144,11 @@ export function getRuntimeServicePingQueryOptions(
   client: RuntimeClient,
   request: PartialMessage<PingRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<PingResponse>>;
+    query?: Partial<CreateQueryOptions<V1PingResponse>>;
   },
-): CreateQueryOptions<PingResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1PingResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServicePingQueryKey(client.instanceId, request);
-  const queryFn: QueryFunction<PingResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1PingResponse> = ({ signal }) =>
     runtimeServicePing(client, request, { signal });
   return {
     queryKey,
@@ -154,10 +162,10 @@ export function createRuntimeServicePing(
   client: RuntimeClient,
   request: PartialMessage<PingRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<PingResponse>>;
+    query?: Partial<CreateQueryOptions<V1PingResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<PingResponse> {
+): CreateQueryResult<V1PingResponse> {
   const queryOptions = getRuntimeServicePingQueryOptions(
     client,
     request,
@@ -173,8 +181,12 @@ export function runtimeServiceHealth(
   client: RuntimeClient,
   request: PartialMessage<HealthRequest>,
   options?: { signal?: AbortSignal },
-): Promise<HealthResponse> {
-  return client.runtimeService.health(request, { signal: options?.signal });
+): Promise<V1HealthResponse> {
+  return client.runtimeService
+    .health(HealthRequest.fromJson(request as unknown as JsonValue), {
+      signal: options?.signal,
+    })
+    .then((r) => r.toJson() as unknown as V1HealthResponse);
 }
 
 export function getRuntimeServiceHealthQueryKey(
@@ -188,11 +200,11 @@ export function getRuntimeServiceHealthQueryOptions(
   client: RuntimeClient,
   request: PartialMessage<HealthRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<HealthResponse>>;
+    query?: Partial<CreateQueryOptions<V1HealthResponse>>;
   },
-): CreateQueryOptions<HealthResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1HealthResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceHealthQueryKey(client.instanceId, request);
-  const queryFn: QueryFunction<HealthResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1HealthResponse> = ({ signal }) =>
     runtimeServiceHealth(client, request, { signal });
   return {
     queryKey,
@@ -206,10 +218,10 @@ export function createRuntimeServiceHealth(
   client: RuntimeClient,
   request: PartialMessage<HealthRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<HealthResponse>>;
+    query?: Partial<CreateQueryOptions<V1HealthResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<HealthResponse> {
+): CreateQueryResult<V1HealthResponse> {
   const queryOptions = getRuntimeServiceHealthQueryOptions(
     client,
     request,
@@ -225,11 +237,16 @@ export function runtimeServiceInstanceHealth(
   client: RuntimeClient,
   request: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<InstanceHealthResponse> {
-  return client.runtimeService.instanceHealth(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1InstanceHealthResponse> {
+  return client.runtimeService
+    .instanceHealth(
+      InstanceHealthRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1InstanceHealthResponse);
 }
 
 export function getRuntimeServiceInstanceHealthQueryKey(
@@ -248,14 +265,14 @@ export function getRuntimeServiceInstanceHealthQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<InstanceHealthResponse>>;
+    query?: Partial<CreateQueryOptions<V1InstanceHealthResponse>>;
   },
-): CreateQueryOptions<InstanceHealthResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1InstanceHealthResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceInstanceHealthQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<InstanceHealthResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1InstanceHealthResponse> = ({ signal }) =>
     runtimeServiceInstanceHealth(client, request, { signal });
   return {
     queryKey,
@@ -269,10 +286,10 @@ export function createRuntimeServiceInstanceHealth(
   client: RuntimeClient,
   request: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<InstanceHealthResponse>>;
+    query?: Partial<CreateQueryOptions<V1InstanceHealthResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<InstanceHealthResponse> {
+): CreateQueryResult<V1InstanceHealthResponse> {
   const queryOptions = getRuntimeServiceInstanceHealthQueryOptions(
     client,
     request,
@@ -288,10 +305,13 @@ export function runtimeServiceListInstances(
   client: RuntimeClient,
   request: PartialMessage<ListInstancesRequest>,
   options?: { signal?: AbortSignal },
-): Promise<ListInstancesResponse> {
-  return client.runtimeService.listInstances(request, {
-    signal: options?.signal,
-  });
+): Promise<V1ListInstancesResponse> {
+  return client.runtimeService
+    .listInstances(
+      ListInstancesRequest.fromJson(request as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListInstancesResponse);
 }
 
 export function getRuntimeServiceListInstancesQueryKey(
@@ -310,14 +330,14 @@ export function getRuntimeServiceListInstancesQueryOptions(
   client: RuntimeClient,
   request: PartialMessage<ListInstancesRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<ListInstancesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListInstancesResponse>>;
   },
-): CreateQueryOptions<ListInstancesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListInstancesResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListInstancesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListInstancesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListInstancesResponse> = ({ signal }) =>
     runtimeServiceListInstances(client, request, { signal });
   return {
     queryKey,
@@ -331,10 +351,10 @@ export function createRuntimeServiceListInstances(
   client: RuntimeClient,
   request: PartialMessage<ListInstancesRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<ListInstancesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListInstancesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListInstancesResponse> {
+): CreateQueryResult<V1ListInstancesResponse> {
   const queryOptions = getRuntimeServiceListInstancesQueryOptions(
     client,
     request,
@@ -350,11 +370,16 @@ export function runtimeServiceGetInstance(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<GetInstanceResponse> {
-  return client.runtimeService.getInstance(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1GetInstanceResponse> {
+  return client.runtimeService
+    .getInstance(
+      GetInstanceRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1GetInstanceResponse);
 }
 
 export function getRuntimeServiceGetInstanceQueryKey(
@@ -368,14 +393,14 @@ export function getRuntimeServiceGetInstanceQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetInstanceResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetInstanceResponse>>;
   },
-): CreateQueryOptions<GetInstanceResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetInstanceResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceGetInstanceQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<GetInstanceResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1GetInstanceResponse> = ({ signal }) =>
     runtimeServiceGetInstance(client, request, { signal });
   return {
     queryKey,
@@ -389,10 +414,10 @@ export function createRuntimeServiceGetInstance(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetInstanceResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetInstanceResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<GetInstanceResponse> {
+): CreateQueryResult<V1GetInstanceResponse> {
   const queryOptions = getRuntimeServiceGetInstanceQueryOptions(
     client,
     request,
@@ -408,11 +433,16 @@ export function runtimeServiceListFiles(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListFilesResponse> {
-  return client.runtimeService.listFiles(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListFilesResponse> {
+  return client.runtimeService
+    .listFiles(
+      ListFilesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListFilesResponse);
 }
 
 export function getRuntimeServiceListFilesQueryKey(
@@ -426,14 +456,14 @@ export function getRuntimeServiceListFilesQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListFilesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListFilesResponse>>;
   },
-): CreateQueryOptions<ListFilesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListFilesResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListFilesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListFilesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListFilesResponse> = ({ signal }) =>
     runtimeServiceListFiles(client, request, { signal });
   return {
     queryKey,
@@ -447,10 +477,10 @@ export function createRuntimeServiceListFiles(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListFilesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListFilesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListFilesResponse> {
+): CreateQueryResult<V1ListFilesResponse> {
   const queryOptions = getRuntimeServiceListFilesQueryOptions(
     client,
     request,
@@ -466,11 +496,16 @@ export function runtimeServiceGetFile(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetFileRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<GetFileResponse> {
-  return client.runtimeService.getFile(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1GetFileResponse> {
+  return client.runtimeService
+    .getFile(
+      GetFileRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1GetFileResponse);
 }
 
 export function getRuntimeServiceGetFileQueryKey(
@@ -484,11 +519,11 @@ export function getRuntimeServiceGetFileQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetFileRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetFileResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetFileResponse>>;
   },
-): CreateQueryOptions<GetFileResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetFileResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceGetFileQueryKey(client.instanceId, request);
-  const queryFn: QueryFunction<GetFileResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1GetFileResponse> = ({ signal }) =>
     runtimeServiceGetFile(client, request, { signal });
   return {
     queryKey,
@@ -502,10 +537,10 @@ export function createRuntimeServiceGetFile(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetFileRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetFileResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetFileResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<GetFileResponse> {
+): CreateQueryResult<V1GetFileResponse> {
   const queryOptions = getRuntimeServiceGetFileQueryOptions(
     client,
     request,
@@ -521,10 +556,13 @@ export function runtimeServiceListExamples(
   client: RuntimeClient,
   request: PartialMessage<ListExamplesRequest>,
   options?: { signal?: AbortSignal },
-): Promise<ListExamplesResponse> {
-  return client.runtimeService.listExamples(request, {
-    signal: options?.signal,
-  });
+): Promise<V1ListExamplesResponse> {
+  return client.runtimeService
+    .listExamples(
+      ListExamplesRequest.fromJson(request as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListExamplesResponse);
 }
 
 export function getRuntimeServiceListExamplesQueryKey(
@@ -538,14 +576,14 @@ export function getRuntimeServiceListExamplesQueryOptions(
   client: RuntimeClient,
   request: PartialMessage<ListExamplesRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<ListExamplesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListExamplesResponse>>;
   },
-): CreateQueryOptions<ListExamplesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListExamplesResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListExamplesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListExamplesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListExamplesResponse> = ({ signal }) =>
     runtimeServiceListExamples(client, request, { signal });
   return {
     queryKey,
@@ -559,10 +597,10 @@ export function createRuntimeServiceListExamples(
   client: RuntimeClient,
   request: PartialMessage<ListExamplesRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<ListExamplesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListExamplesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListExamplesResponse> {
+): CreateQueryResult<V1ListExamplesResponse> {
   const queryOptions = getRuntimeServiceListExamplesQueryOptions(
     client,
     request,
@@ -578,11 +616,16 @@ export function runtimeServiceQueryResolver(
   client: RuntimeClient,
   request: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<QueryResolverResponse> {
-  return client.runtimeService.queryResolver(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1QueryResolverResponse> {
+  return client.runtimeService
+    .queryResolver(
+      QueryResolverRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1QueryResolverResponse);
 }
 
 export function getRuntimeServiceQueryResolverQueryKey(
@@ -601,14 +644,14 @@ export function getRuntimeServiceQueryResolverQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<QueryResolverResponse>>;
+    query?: Partial<CreateQueryOptions<V1QueryResolverResponse>>;
   },
-): CreateQueryOptions<QueryResolverResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1QueryResolverResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceQueryResolverQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<QueryResolverResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1QueryResolverResponse> = ({ signal }) =>
     runtimeServiceQueryResolver(client, request, { signal });
   return {
     queryKey,
@@ -622,10 +665,10 @@ export function createRuntimeServiceQueryResolver(
   client: RuntimeClient,
   request: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<QueryResolverResponse>>;
+    query?: Partial<CreateQueryOptions<V1QueryResolverResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<QueryResolverResponse> {
+): CreateQueryResult<V1QueryResolverResponse> {
   const queryOptions = getRuntimeServiceQueryResolverQueryOptions(
     client,
     request,
@@ -641,11 +684,16 @@ export function runtimeServiceGetLogs(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<GetLogsResponse> {
-  return client.runtimeService.getLogs(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1GetLogsResponse> {
+  return client.runtimeService
+    .getLogs(
+      GetLogsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1GetLogsResponse);
 }
 
 export function getRuntimeServiceGetLogsQueryKey(
@@ -659,11 +707,11 @@ export function getRuntimeServiceGetLogsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetLogsResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetLogsResponse>>;
   },
-): CreateQueryOptions<GetLogsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetLogsResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceGetLogsQueryKey(client.instanceId, request);
-  const queryFn: QueryFunction<GetLogsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1GetLogsResponse> = ({ signal }) =>
     runtimeServiceGetLogs(client, request, { signal });
   return {
     queryKey,
@@ -677,10 +725,10 @@ export function createRuntimeServiceGetLogs(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetLogsResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetLogsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<GetLogsResponse> {
+): CreateQueryResult<V1GetLogsResponse> {
   const queryOptions = getRuntimeServiceGetLogsQueryOptions(
     client,
     request,
@@ -696,11 +744,16 @@ export function runtimeServiceListResources(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListResourcesResponse> {
-  return client.runtimeService.listResources(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListResourcesResponse> {
+  return client.runtimeService
+    .listResources(
+      ListResourcesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListResourcesResponse);
 }
 
 export function getRuntimeServiceListResourcesQueryKey(
@@ -719,14 +772,14 @@ export function getRuntimeServiceListResourcesQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListResourcesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListResourcesResponse>>;
   },
-): CreateQueryOptions<ListResourcesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListResourcesResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListResourcesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListResourcesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListResourcesResponse> = ({ signal }) =>
     runtimeServiceListResources(client, request, { signal });
   return {
     queryKey,
@@ -740,10 +793,10 @@ export function createRuntimeServiceListResources(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListResourcesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListResourcesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListResourcesResponse> {
+): CreateQueryResult<V1ListResourcesResponse> {
   const queryOptions = getRuntimeServiceListResourcesQueryOptions(
     client,
     request,
@@ -759,11 +812,16 @@ export function runtimeServiceGetResource(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<GetResourceResponse> {
-  return client.runtimeService.getResource(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1GetResourceResponse> {
+  return client.runtimeService
+    .getResource(
+      GetResourceRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1GetResourceResponse);
 }
 
 export function getRuntimeServiceGetResourceQueryKey(
@@ -777,14 +835,14 @@ export function getRuntimeServiceGetResourceQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetResourceResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetResourceResponse>>;
   },
-): CreateQueryOptions<GetResourceResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetResourceResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceGetResourceQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<GetResourceResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1GetResourceResponse> = ({ signal }) =>
     runtimeServiceGetResource(client, request, { signal });
   return {
     queryKey,
@@ -798,10 +856,10 @@ export function createRuntimeServiceGetResource(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetResourceResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetResourceResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<GetResourceResponse> {
+): CreateQueryResult<V1GetResourceResponse> {
   const queryOptions = getRuntimeServiceGetResourceQueryOptions(
     client,
     request,
@@ -817,11 +875,16 @@ export function runtimeServiceGetExplore(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<GetExploreResponse> {
-  return client.runtimeService.getExplore(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1GetExploreResponse> {
+  return client.runtimeService
+    .getExplore(
+      GetExploreRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1GetExploreResponse);
 }
 
 export function getRuntimeServiceGetExploreQueryKey(
@@ -835,14 +898,14 @@ export function getRuntimeServiceGetExploreQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetExploreResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetExploreResponse>>;
   },
-): CreateQueryOptions<GetExploreResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetExploreResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceGetExploreQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<GetExploreResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1GetExploreResponse> = ({ signal }) =>
     runtimeServiceGetExplore(client, request, { signal });
   return {
     queryKey,
@@ -856,10 +919,10 @@ export function createRuntimeServiceGetExplore(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetExploreResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetExploreResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<GetExploreResponse> {
+): CreateQueryResult<V1GetExploreResponse> {
   const queryOptions = getRuntimeServiceGetExploreQueryOptions(
     client,
     request,
@@ -875,11 +938,16 @@ export function runtimeServiceGetModelPartitions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<GetModelPartitionsResponse> {
-  return client.runtimeService.getModelPartitions(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1GetModelPartitionsResponse> {
+  return client.runtimeService
+    .getModelPartitions(
+      GetModelPartitionsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1GetModelPartitionsResponse);
 }
 
 export function getRuntimeServiceGetModelPartitionsQueryKey(
@@ -898,14 +966,14 @@ export function getRuntimeServiceGetModelPartitionsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetModelPartitionsResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetModelPartitionsResponse>>;
   },
-): CreateQueryOptions<GetModelPartitionsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetModelPartitionsResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceGetModelPartitionsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<GetModelPartitionsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1GetModelPartitionsResponse> = ({ signal }) =>
     runtimeServiceGetModelPartitions(client, request, { signal });
   return {
     queryKey,
@@ -919,10 +987,10 @@ export function createRuntimeServiceGetModelPartitions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetModelPartitionsResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetModelPartitionsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<GetModelPartitionsResponse> {
+): CreateQueryResult<V1GetModelPartitionsResponse> {
   const queryOptions = getRuntimeServiceGetModelPartitionsQueryOptions(
     client,
     request,
@@ -938,10 +1006,13 @@ export function runtimeServiceListConnectorDrivers(
   client: RuntimeClient,
   request: PartialMessage<ListConnectorDriversRequest>,
   options?: { signal?: AbortSignal },
-): Promise<ListConnectorDriversResponse> {
-  return client.runtimeService.listConnectorDrivers(request, {
-    signal: options?.signal,
-  });
+): Promise<V1ListConnectorDriversResponse> {
+  return client.runtimeService
+    .listConnectorDrivers(
+      ListConnectorDriversRequest.fromJson(request as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListConnectorDriversResponse);
 }
 
 export function getRuntimeServiceListConnectorDriversQueryKey(
@@ -960,14 +1031,14 @@ export function getRuntimeServiceListConnectorDriversQueryOptions(
   client: RuntimeClient,
   request: PartialMessage<ListConnectorDriversRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<ListConnectorDriversResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListConnectorDriversResponse>>;
   },
-): CreateQueryOptions<ListConnectorDriversResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListConnectorDriversResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListConnectorDriversQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListConnectorDriversResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListConnectorDriversResponse> = ({ signal }) =>
     runtimeServiceListConnectorDrivers(client, request, { signal });
   return {
     queryKey,
@@ -981,10 +1052,10 @@ export function createRuntimeServiceListConnectorDrivers(
   client: RuntimeClient,
   request: PartialMessage<ListConnectorDriversRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<ListConnectorDriversResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListConnectorDriversResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListConnectorDriversResponse> {
+): CreateQueryResult<V1ListConnectorDriversResponse> {
   const queryOptions = getRuntimeServiceListConnectorDriversQueryOptions(
     client,
     request,
@@ -1000,11 +1071,16 @@ export function runtimeServiceAnalyzeConnectors(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<AnalyzeConnectorsResponse> {
-  return client.runtimeService.analyzeConnectors(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1AnalyzeConnectorsResponse> {
+  return client.runtimeService
+    .analyzeConnectors(
+      AnalyzeConnectorsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1AnalyzeConnectorsResponse);
 }
 
 export function getRuntimeServiceAnalyzeConnectorsQueryKey(
@@ -1023,14 +1099,14 @@ export function getRuntimeServiceAnalyzeConnectorsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<AnalyzeConnectorsResponse>>;
+    query?: Partial<CreateQueryOptions<V1AnalyzeConnectorsResponse>>;
   },
-): CreateQueryOptions<AnalyzeConnectorsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1AnalyzeConnectorsResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceAnalyzeConnectorsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<AnalyzeConnectorsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1AnalyzeConnectorsResponse> = ({ signal }) =>
     runtimeServiceAnalyzeConnectors(client, request, { signal });
   return {
     queryKey,
@@ -1044,10 +1120,10 @@ export function createRuntimeServiceAnalyzeConnectors(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<AnalyzeConnectorsResponse>>;
+    query?: Partial<CreateQueryOptions<V1AnalyzeConnectorsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<AnalyzeConnectorsResponse> {
+): CreateQueryResult<V1AnalyzeConnectorsResponse> {
   const queryOptions = getRuntimeServiceAnalyzeConnectorsQueryOptions(
     client,
     request,
@@ -1063,11 +1139,16 @@ export function runtimeServiceListNotifierConnectors(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListNotifierConnectorsResponse> {
-  return client.runtimeService.listNotifierConnectors(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListNotifierConnectorsResponse> {
+  return client.runtimeService
+    .listNotifierConnectors(
+      ListNotifierConnectorsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListNotifierConnectorsResponse);
 }
 
 export function getRuntimeServiceListNotifierConnectorsQueryKey(
@@ -1086,15 +1167,18 @@ export function getRuntimeServiceListNotifierConnectorsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListNotifierConnectorsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListNotifierConnectorsResponse>>;
   },
-): CreateQueryOptions<ListNotifierConnectorsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListNotifierConnectorsResponse> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListNotifierConnectorsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListNotifierConnectorsResponse> = ({ signal }) =>
-    runtimeServiceListNotifierConnectors(client, request, { signal });
+  const queryFn: QueryFunction<V1ListNotifierConnectorsResponse> = ({
+    signal,
+  }) => runtimeServiceListNotifierConnectors(client, request, { signal });
   return {
     queryKey,
     queryFn,
@@ -1107,10 +1191,10 @@ export function createRuntimeServiceListNotifierConnectors(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListNotifierConnectorsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListNotifierConnectorsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListNotifierConnectorsResponse> {
+): CreateQueryResult<V1ListNotifierConnectorsResponse> {
   const queryOptions = getRuntimeServiceListNotifierConnectorsQueryOptions(
     client,
     request,
@@ -1126,11 +1210,16 @@ export function runtimeServiceListConversations(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListConversationsResponse> {
-  return client.runtimeService.listConversations(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListConversationsResponse> {
+  return client.runtimeService
+    .listConversations(
+      ListConversationsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListConversationsResponse);
 }
 
 export function getRuntimeServiceListConversationsQueryKey(
@@ -1149,14 +1238,14 @@ export function getRuntimeServiceListConversationsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListConversationsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListConversationsResponse>>;
   },
-): CreateQueryOptions<ListConversationsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListConversationsResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListConversationsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListConversationsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListConversationsResponse> = ({ signal }) =>
     runtimeServiceListConversations(client, request, { signal });
   return {
     queryKey,
@@ -1170,10 +1259,10 @@ export function createRuntimeServiceListConversations(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListConversationsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListConversationsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListConversationsResponse> {
+): CreateQueryResult<V1ListConversationsResponse> {
   const queryOptions = getRuntimeServiceListConversationsQueryOptions(
     client,
     request,
@@ -1189,11 +1278,16 @@ export function runtimeServiceGetConversation(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<GetConversationResponse> {
-  return client.runtimeService.getConversation(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1GetConversationResponse> {
+  return client.runtimeService
+    .getConversation(
+      GetConversationRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1GetConversationResponse);
 }
 
 export function getRuntimeServiceGetConversationQueryKey(
@@ -1212,14 +1306,14 @@ export function getRuntimeServiceGetConversationQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetConversationResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetConversationResponse>>;
   },
-): CreateQueryOptions<GetConversationResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetConversationResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceGetConversationQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<GetConversationResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1GetConversationResponse> = ({ signal }) =>
     runtimeServiceGetConversation(client, request, { signal });
   return {
     queryKey,
@@ -1233,10 +1327,10 @@ export function createRuntimeServiceGetConversation(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<GetConversationResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetConversationResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<GetConversationResponse> {
+): CreateQueryResult<V1GetConversationResponse> {
   const queryOptions = getRuntimeServiceGetConversationQueryOptions(
     client,
     request,
@@ -1252,11 +1346,16 @@ export function runtimeServiceListTools(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListToolsResponse> {
-  return client.runtimeService.listTools(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListToolsResponse> {
+  return client.runtimeService
+    .listTools(
+      ListToolsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListToolsResponse);
 }
 
 export function getRuntimeServiceListToolsQueryKey(
@@ -1270,14 +1369,14 @@ export function getRuntimeServiceListToolsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListToolsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListToolsResponse>>;
   },
-): CreateQueryOptions<ListToolsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListToolsResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListToolsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListToolsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListToolsResponse> = ({ signal }) =>
     runtimeServiceListTools(client, request, { signal });
   return {
     queryKey,
@@ -1291,10 +1390,10 @@ export function createRuntimeServiceListTools(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListToolsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListToolsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListToolsResponse> {
+): CreateQueryResult<V1ListToolsResponse> {
   const queryOptions = getRuntimeServiceListToolsQueryOptions(
     client,
     request,
@@ -1308,33 +1407,35 @@ export function createRuntimeServiceListTools(
  */
 export function runtimeServiceIssueDevJWT(
   client: RuntimeClient,
-  request: PartialMessage<IssueDevJWTRequest>,
+  request: V1IssueDevJWTRequest,
   options?: { signal?: AbortSignal },
-): Promise<IssueDevJWTResponse> {
-  return client.runtimeService.issueDevJWT(request, {
-    signal: options?.signal,
-  });
+): Promise<V1IssueDevJWTResponse> {
+  return client.runtimeService
+    .issueDevJWT(IssueDevJWTRequest.fromJson(request as unknown as JsonValue), {
+      signal: options?.signal,
+    })
+    .then((r) => r.toJson() as unknown as V1IssueDevJWTResponse);
 }
 
 export function getRuntimeServiceIssueDevJWTQueryKey(
   instanceId: string,
-  request?: PartialMessage<IssueDevJWTRequest>,
+  request?: V1IssueDevJWTRequest,
 ): QueryKey {
   return ["RuntimeService", "issueDevJWT", instanceId, request ?? {}] as const;
 }
 
 export function getRuntimeServiceIssueDevJWTQueryOptions(
   client: RuntimeClient,
-  request: PartialMessage<IssueDevJWTRequest>,
+  request: V1IssueDevJWTRequest,
   options?: {
-    query?: Partial<CreateQueryOptions<IssueDevJWTResponse>>;
+    query?: Partial<CreateQueryOptions<V1IssueDevJWTResponse>>;
   },
-): CreateQueryOptions<IssueDevJWTResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1IssueDevJWTResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceIssueDevJWTQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<IssueDevJWTResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1IssueDevJWTResponse> = ({ signal }) =>
     runtimeServiceIssueDevJWT(client, request, { signal });
   return {
     queryKey,
@@ -1346,12 +1447,12 @@ export function getRuntimeServiceIssueDevJWTQueryOptions(
 
 export function createRuntimeServiceIssueDevJWT(
   client: RuntimeClient,
-  request: PartialMessage<IssueDevJWTRequest>,
+  request: V1IssueDevJWTRequest,
   options?: {
-    query?: Partial<CreateQueryOptions<IssueDevJWTResponse>>;
+    query?: Partial<CreateQueryOptions<V1IssueDevJWTResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<IssueDevJWTResponse> {
+): CreateQueryResult<V1IssueDevJWTResponse> {
   const queryOptions = getRuntimeServiceIssueDevJWTQueryOptions(
     client,
     request,
@@ -1367,11 +1468,16 @@ export function runtimeServiceAnalyzeVariables(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<AnalyzeVariablesResponse> {
-  return client.runtimeService.analyzeVariables(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1AnalyzeVariablesResponse> {
+  return client.runtimeService
+    .analyzeVariables(
+      AnalyzeVariablesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1AnalyzeVariablesResponse);
 }
 
 export function getRuntimeServiceAnalyzeVariablesQueryKey(
@@ -1390,14 +1496,14 @@ export function getRuntimeServiceAnalyzeVariablesQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<AnalyzeVariablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1AnalyzeVariablesResponse>>;
   },
-): CreateQueryOptions<AnalyzeVariablesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1AnalyzeVariablesResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceAnalyzeVariablesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<AnalyzeVariablesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1AnalyzeVariablesResponse> = ({ signal }) =>
     runtimeServiceAnalyzeVariables(client, request, { signal });
   return {
     queryKey,
@@ -1411,10 +1517,10 @@ export function createRuntimeServiceAnalyzeVariables(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<AnalyzeVariablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1AnalyzeVariablesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<AnalyzeVariablesResponse> {
+): CreateQueryResult<V1AnalyzeVariablesResponse> {
   const queryOptions = getRuntimeServiceAnalyzeVariablesQueryOptions(
     client,
     request,
@@ -1430,11 +1536,16 @@ export function runtimeServiceListGitCommits(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListGitCommitsResponse> {
-  return client.runtimeService.listGitCommits(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListGitCommitsResponse> {
+  return client.runtimeService
+    .listGitCommits(
+      ListGitCommitsRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListGitCommitsResponse);
 }
 
 export function getRuntimeServiceListGitCommitsQueryKey(
@@ -1453,14 +1564,14 @@ export function getRuntimeServiceListGitCommitsQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListGitCommitsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListGitCommitsResponse>>;
   },
-): CreateQueryOptions<ListGitCommitsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListGitCommitsResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListGitCommitsQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListGitCommitsResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListGitCommitsResponse> = ({ signal }) =>
     runtimeServiceListGitCommits(client, request, { signal });
   return {
     queryKey,
@@ -1474,10 +1585,10 @@ export function createRuntimeServiceListGitCommits(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListGitCommitsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListGitCommitsResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListGitCommitsResponse> {
+): CreateQueryResult<V1ListGitCommitsResponse> {
   const queryOptions = getRuntimeServiceListGitCommitsQueryOptions(
     client,
     request,
@@ -1493,11 +1604,16 @@ export function runtimeServiceListGitBranches(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
   options?: { signal?: AbortSignal },
-): Promise<ListGitBranchesResponse> {
-  return client.runtimeService.listGitBranches(
-    { instanceId: client.instanceId, ...request },
-    { signal: options?.signal },
-  );
+): Promise<V1ListGitBranchesResponse> {
+  return client.runtimeService
+    .listGitBranches(
+      ListGitBranchesRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+      { signal: options?.signal },
+    )
+    .then((r) => r.toJson() as unknown as V1ListGitBranchesResponse);
 }
 
 export function getRuntimeServiceListGitBranchesQueryKey(
@@ -1516,14 +1632,14 @@ export function getRuntimeServiceListGitBranchesQueryOptions(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListGitBranchesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListGitBranchesResponse>>;
   },
-): CreateQueryOptions<ListGitBranchesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListGitBranchesResponse> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceListGitBranchesQueryKey(
     client.instanceId,
     request,
   );
-  const queryFn: QueryFunction<ListGitBranchesResponse> = ({ signal }) =>
+  const queryFn: QueryFunction<V1ListGitBranchesResponse> = ({ signal }) =>
     runtimeServiceListGitBranches(client, request, { signal });
   return {
     queryKey,
@@ -1537,10 +1653,10 @@ export function createRuntimeServiceListGitBranches(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<ListGitBranchesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListGitBranchesResponse>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<ListGitBranchesResponse> {
+): CreateQueryResult<V1ListGitBranchesResponse> {
   const queryOptions = getRuntimeServiceListGitBranchesQueryOptions(
     client,
     request,
@@ -1554,27 +1670,31 @@ export function createRuntimeServiceListGitBranches(
  */
 export function runtimeServiceCreateInstance(
   client: RuntimeClient,
-  request: Omit<PartialMessage<CreateInstanceRequest>, "instanceId">,
-): Promise<CreateInstanceResponse> {
-  return client.runtimeService.createInstance({
-    instanceId: client.instanceId,
-    ...request,
-  });
+  request: Omit<V1CreateInstanceRequest, "instanceId">,
+): Promise<V1CreateInstanceResponse> {
+  return client.runtimeService
+    .createInstance(
+      CreateInstanceRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1CreateInstanceResponse);
 }
 
 export function getRuntimeServiceCreateInstanceMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      CreateInstanceResponse,
+      V1CreateInstanceResponse,
       unknown,
-      Omit<PartialMessage<CreateInstanceRequest>, "instanceId">
+      Omit<V1CreateInstanceRequest, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  CreateInstanceResponse,
+  V1CreateInstanceResponse,
   unknown,
-  Omit<PartialMessage<CreateInstanceRequest>, "instanceId">
+  Omit<V1CreateInstanceRequest, "instanceId">
 > {
   return {
     mutationFn: (request) => runtimeServiceCreateInstance(client, request),
@@ -1586,16 +1706,16 @@ export function createRuntimeServiceCreateInstanceMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      CreateInstanceResponse,
+      V1CreateInstanceResponse,
       unknown,
-      Omit<PartialMessage<CreateInstanceRequest>, "instanceId">
+      Omit<V1CreateInstanceRequest, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  CreateInstanceResponse,
+  V1CreateInstanceResponse,
   unknown,
-  Omit<PartialMessage<CreateInstanceRequest>, "instanceId">
+  Omit<V1CreateInstanceRequest, "instanceId">
 > {
   const mutationOptions = getRuntimeServiceCreateInstanceMutationOptions(
     client,
@@ -1610,24 +1730,28 @@ export function createRuntimeServiceCreateInstanceMutation(
 export function runtimeServiceEditInstance(
   client: RuntimeClient,
   request: Omit<PartialMessage<EditInstanceRequest>, "instanceId">,
-): Promise<EditInstanceResponse> {
-  return client.runtimeService.editInstance({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1EditInstanceResponse> {
+  return client.runtimeService
+    .editInstance(
+      EditInstanceRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1EditInstanceResponse);
 }
 
 export function getRuntimeServiceEditInstanceMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      EditInstanceResponse,
+      V1EditInstanceResponse,
       unknown,
       Omit<PartialMessage<EditInstanceRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  EditInstanceResponse,
+  V1EditInstanceResponse,
   unknown,
   Omit<PartialMessage<EditInstanceRequest>, "instanceId">
 > {
@@ -1641,14 +1765,14 @@ export function createRuntimeServiceEditInstanceMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      EditInstanceResponse,
+      V1EditInstanceResponse,
       unknown,
       Omit<PartialMessage<EditInstanceRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  EditInstanceResponse,
+  V1EditInstanceResponse,
   unknown,
   Omit<PartialMessage<EditInstanceRequest>, "instanceId">
 > {
@@ -1665,24 +1789,28 @@ export function createRuntimeServiceEditInstanceMutation(
 export function runtimeServiceDeleteInstance(
   client: RuntimeClient,
   request: Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">,
-): Promise<DeleteInstanceResponse> {
-  return client.runtimeService.deleteInstance({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1DeleteInstanceResponse> {
+  return client.runtimeService
+    .deleteInstance(
+      DeleteInstanceRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1DeleteInstanceResponse);
 }
 
 export function getRuntimeServiceDeleteInstanceMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      DeleteInstanceResponse,
+      V1DeleteInstanceResponse,
       unknown,
       Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  DeleteInstanceResponse,
+  V1DeleteInstanceResponse,
   unknown,
   Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">
 > {
@@ -1696,14 +1824,14 @@ export function createRuntimeServiceDeleteInstanceMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      DeleteInstanceResponse,
+      V1DeleteInstanceResponse,
       unknown,
       Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  DeleteInstanceResponse,
+  V1DeleteInstanceResponse,
   unknown,
   Omit<PartialMessage<DeleteInstanceRequest>, "instanceId">
 > {
@@ -1720,24 +1848,28 @@ export function createRuntimeServiceDeleteInstanceMutation(
 export function runtimeServiceReloadConfig(
   client: RuntimeClient,
   request: Omit<PartialMessage<ReloadConfigRequest>, "instanceId">,
-): Promise<ReloadConfigResponse> {
-  return client.runtimeService.reloadConfig({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1ReloadConfigResponse> {
+  return client.runtimeService
+    .reloadConfig(
+      ReloadConfigRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1ReloadConfigResponse);
 }
 
 export function getRuntimeServiceReloadConfigMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ReloadConfigResponse,
+      V1ReloadConfigResponse,
       unknown,
       Omit<PartialMessage<ReloadConfigRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  ReloadConfigResponse,
+  V1ReloadConfigResponse,
   unknown,
   Omit<PartialMessage<ReloadConfigRequest>, "instanceId">
 > {
@@ -1751,14 +1883,14 @@ export function createRuntimeServiceReloadConfigMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ReloadConfigResponse,
+      V1ReloadConfigResponse,
       unknown,
       Omit<PartialMessage<ReloadConfigRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  ReloadConfigResponse,
+  V1ReloadConfigResponse,
   unknown,
   Omit<PartialMessage<ReloadConfigRequest>, "instanceId">
 > {
@@ -1775,24 +1907,28 @@ export function createRuntimeServiceReloadConfigMutation(
 export function runtimeServicePutFile(
   client: RuntimeClient,
   request: Omit<PartialMessage<PutFileRequest>, "instanceId">,
-): Promise<PutFileResponse> {
-  return client.runtimeService.putFile({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1PutFileResponse> {
+  return client.runtimeService
+    .putFile(
+      PutFileRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1PutFileResponse);
 }
 
 export function getRuntimeServicePutFileMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      PutFileResponse,
+      V1PutFileResponse,
       unknown,
       Omit<PartialMessage<PutFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  PutFileResponse,
+  V1PutFileResponse,
   unknown,
   Omit<PartialMessage<PutFileRequest>, "instanceId">
 > {
@@ -1806,14 +1942,14 @@ export function createRuntimeServicePutFileMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      PutFileResponse,
+      V1PutFileResponse,
       unknown,
       Omit<PartialMessage<PutFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  PutFileResponse,
+  V1PutFileResponse,
   unknown,
   Omit<PartialMessage<PutFileRequest>, "instanceId">
 > {
@@ -1830,24 +1966,28 @@ export function createRuntimeServicePutFileMutation(
 export function runtimeServiceCreateDirectory(
   client: RuntimeClient,
   request: Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">,
-): Promise<CreateDirectoryResponse> {
-  return client.runtimeService.createDirectory({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1CreateDirectoryResponse> {
+  return client.runtimeService
+    .createDirectory(
+      CreateDirectoryRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1CreateDirectoryResponse);
 }
 
 export function getRuntimeServiceCreateDirectoryMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      CreateDirectoryResponse,
+      V1CreateDirectoryResponse,
       unknown,
       Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  CreateDirectoryResponse,
+  V1CreateDirectoryResponse,
   unknown,
   Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">
 > {
@@ -1861,14 +2001,14 @@ export function createRuntimeServiceCreateDirectoryMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      CreateDirectoryResponse,
+      V1CreateDirectoryResponse,
       unknown,
       Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  CreateDirectoryResponse,
+  V1CreateDirectoryResponse,
   unknown,
   Omit<PartialMessage<CreateDirectoryRequest>, "instanceId">
 > {
@@ -1885,24 +2025,28 @@ export function createRuntimeServiceCreateDirectoryMutation(
 export function runtimeServiceDeleteFile(
   client: RuntimeClient,
   request: Omit<PartialMessage<DeleteFileRequest>, "instanceId">,
-): Promise<DeleteFileResponse> {
-  return client.runtimeService.deleteFile({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1DeleteFileResponse> {
+  return client.runtimeService
+    .deleteFile(
+      DeleteFileRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1DeleteFileResponse);
 }
 
 export function getRuntimeServiceDeleteFileMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      DeleteFileResponse,
+      V1DeleteFileResponse,
       unknown,
       Omit<PartialMessage<DeleteFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  DeleteFileResponse,
+  V1DeleteFileResponse,
   unknown,
   Omit<PartialMessage<DeleteFileRequest>, "instanceId">
 > {
@@ -1916,14 +2060,14 @@ export function createRuntimeServiceDeleteFileMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      DeleteFileResponse,
+      V1DeleteFileResponse,
       unknown,
       Omit<PartialMessage<DeleteFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  DeleteFileResponse,
+  V1DeleteFileResponse,
   unknown,
   Omit<PartialMessage<DeleteFileRequest>, "instanceId">
 > {
@@ -1940,24 +2084,28 @@ export function createRuntimeServiceDeleteFileMutation(
 export function runtimeServiceRenameFile(
   client: RuntimeClient,
   request: Omit<PartialMessage<RenameFileRequest>, "instanceId">,
-): Promise<RenameFileResponse> {
-  return client.runtimeService.renameFile({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1RenameFileResponse> {
+  return client.runtimeService
+    .renameFile(
+      RenameFileRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1RenameFileResponse);
 }
 
 export function getRuntimeServiceRenameFileMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      RenameFileResponse,
+      V1RenameFileResponse,
       unknown,
       Omit<PartialMessage<RenameFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  RenameFileResponse,
+  V1RenameFileResponse,
   unknown,
   Omit<PartialMessage<RenameFileRequest>, "instanceId">
 > {
@@ -1971,14 +2119,14 @@ export function createRuntimeServiceRenameFileMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      RenameFileResponse,
+      V1RenameFileResponse,
       unknown,
       Omit<PartialMessage<RenameFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  RenameFileResponse,
+  V1RenameFileResponse,
   unknown,
   Omit<PartialMessage<RenameFileRequest>, "instanceId">
 > {
@@ -1995,24 +2143,28 @@ export function createRuntimeServiceRenameFileMutation(
 export function runtimeServiceUnpackExample(
   client: RuntimeClient,
   request: Omit<PartialMessage<UnpackExampleRequest>, "instanceId">,
-): Promise<UnpackExampleResponse> {
-  return client.runtimeService.unpackExample({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1UnpackExampleResponse> {
+  return client.runtimeService
+    .unpackExample(
+      UnpackExampleRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1UnpackExampleResponse);
 }
 
 export function getRuntimeServiceUnpackExampleMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      UnpackExampleResponse,
+      V1UnpackExampleResponse,
       unknown,
       Omit<PartialMessage<UnpackExampleRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  UnpackExampleResponse,
+  V1UnpackExampleResponse,
   unknown,
   Omit<PartialMessage<UnpackExampleRequest>, "instanceId">
 > {
@@ -2026,14 +2178,14 @@ export function createRuntimeServiceUnpackExampleMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      UnpackExampleResponse,
+      V1UnpackExampleResponse,
       unknown,
       Omit<PartialMessage<UnpackExampleRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  UnpackExampleResponse,
+  V1UnpackExampleResponse,
   unknown,
   Omit<PartialMessage<UnpackExampleRequest>, "instanceId">
 > {
@@ -2050,24 +2202,28 @@ export function createRuntimeServiceUnpackExampleMutation(
 export function runtimeServiceUnpackEmpty(
   client: RuntimeClient,
   request: Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">,
-): Promise<UnpackEmptyResponse> {
-  return client.runtimeService.unpackEmpty({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1UnpackEmptyResponse> {
+  return client.runtimeService
+    .unpackEmpty(
+      UnpackEmptyRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1UnpackEmptyResponse);
 }
 
 export function getRuntimeServiceUnpackEmptyMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      UnpackEmptyResponse,
+      V1UnpackEmptyResponse,
       unknown,
       Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  UnpackEmptyResponse,
+  V1UnpackEmptyResponse,
   unknown,
   Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">
 > {
@@ -2081,14 +2237,14 @@ export function createRuntimeServiceUnpackEmptyMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      UnpackEmptyResponse,
+      V1UnpackEmptyResponse,
       unknown,
       Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  UnpackEmptyResponse,
+  V1UnpackEmptyResponse,
   unknown,
   Omit<PartialMessage<UnpackEmptyRequest>, "instanceId">
 > {
@@ -2105,24 +2261,28 @@ export function createRuntimeServiceUnpackEmptyMutation(
 export function runtimeServiceGenerateMetricsViewFile(
   client: RuntimeClient,
   request: Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">,
-): Promise<GenerateMetricsViewFileResponse> {
-  return client.runtimeService.generateMetricsViewFile({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GenerateMetricsViewFileResponse> {
+  return client.runtimeService
+    .generateMetricsViewFile(
+      GenerateMetricsViewFileRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GenerateMetricsViewFileResponse);
 }
 
 export function getRuntimeServiceGenerateMetricsViewFileMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GenerateMetricsViewFileResponse,
+      V1GenerateMetricsViewFileResponse,
       unknown,
       Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GenerateMetricsViewFileResponse,
+  V1GenerateMetricsViewFileResponse,
   unknown,
   Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">
 > {
@@ -2137,14 +2297,14 @@ export function createRuntimeServiceGenerateMetricsViewFileMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GenerateMetricsViewFileResponse,
+      V1GenerateMetricsViewFileResponse,
       unknown,
       Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GenerateMetricsViewFileResponse,
+  V1GenerateMetricsViewFileResponse,
   unknown,
   Omit<PartialMessage<GenerateMetricsViewFileRequest>, "instanceId">
 > {
@@ -2159,24 +2319,28 @@ export function createRuntimeServiceGenerateMetricsViewFileMutation(
 export function runtimeServiceGenerateCanvasFile(
   client: RuntimeClient,
   request: Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">,
-): Promise<GenerateCanvasFileResponse> {
-  return client.runtimeService.generateCanvasFile({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GenerateCanvasFileResponse> {
+  return client.runtimeService
+    .generateCanvasFile(
+      GenerateCanvasFileRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GenerateCanvasFileResponse);
 }
 
 export function getRuntimeServiceGenerateCanvasFileMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GenerateCanvasFileResponse,
+      V1GenerateCanvasFileResponse,
       unknown,
       Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GenerateCanvasFileResponse,
+  V1GenerateCanvasFileResponse,
   unknown,
   Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">
 > {
@@ -2190,14 +2354,14 @@ export function createRuntimeServiceGenerateCanvasFileMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GenerateCanvasFileResponse,
+      V1GenerateCanvasFileResponse,
       unknown,
       Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GenerateCanvasFileResponse,
+  V1GenerateCanvasFileResponse,
   unknown,
   Omit<PartialMessage<GenerateCanvasFileRequest>, "instanceId">
 > {
@@ -2214,24 +2378,28 @@ export function createRuntimeServiceGenerateCanvasFileMutation(
 export function runtimeServiceGenerateResolver(
   client: RuntimeClient,
   request: Omit<PartialMessage<GenerateResolverRequest>, "instanceId">,
-): Promise<GenerateResolverResponse> {
-  return client.runtimeService.generateResolver({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GenerateResolverResponse> {
+  return client.runtimeService
+    .generateResolver(
+      GenerateResolverRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GenerateResolverResponse);
 }
 
 export function getRuntimeServiceGenerateResolverMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GenerateResolverResponse,
+      V1GenerateResolverResponse,
       unknown,
       Omit<PartialMessage<GenerateResolverRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GenerateResolverResponse,
+  V1GenerateResolverResponse,
   unknown,
   Omit<PartialMessage<GenerateResolverRequest>, "instanceId">
 > {
@@ -2245,14 +2413,14 @@ export function createRuntimeServiceGenerateResolverMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GenerateResolverResponse,
+      V1GenerateResolverResponse,
       unknown,
       Omit<PartialMessage<GenerateResolverRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GenerateResolverResponse,
+  V1GenerateResolverResponse,
   unknown,
   Omit<PartialMessage<GenerateResolverRequest>, "instanceId">
 > {
@@ -2269,24 +2437,28 @@ export function createRuntimeServiceGenerateResolverMutation(
 export function runtimeServiceGenerateRenderer(
   client: RuntimeClient,
   request: Omit<PartialMessage<GenerateRendererRequest>, "instanceId">,
-): Promise<GenerateRendererResponse> {
-  return client.runtimeService.generateRenderer({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GenerateRendererResponse> {
+  return client.runtimeService
+    .generateRenderer(
+      GenerateRendererRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GenerateRendererResponse);
 }
 
 export function getRuntimeServiceGenerateRendererMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GenerateRendererResponse,
+      V1GenerateRendererResponse,
       unknown,
       Omit<PartialMessage<GenerateRendererRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GenerateRendererResponse,
+  V1GenerateRendererResponse,
   unknown,
   Omit<PartialMessage<GenerateRendererRequest>, "instanceId">
 > {
@@ -2300,14 +2472,14 @@ export function createRuntimeServiceGenerateRendererMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GenerateRendererResponse,
+      V1GenerateRendererResponse,
       unknown,
       Omit<PartialMessage<GenerateRendererRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GenerateRendererResponse,
+  V1GenerateRendererResponse,
   unknown,
   Omit<PartialMessage<GenerateRendererRequest>, "instanceId">
 > {
@@ -2324,24 +2496,28 @@ export function createRuntimeServiceGenerateRendererMutation(
 export function runtimeServiceCreateTrigger(
   client: RuntimeClient,
   request: Omit<PartialMessage<CreateTriggerRequest>, "instanceId">,
-): Promise<CreateTriggerResponse> {
-  return client.runtimeService.createTrigger({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1CreateTriggerResponse> {
+  return client.runtimeService
+    .createTrigger(
+      CreateTriggerRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1CreateTriggerResponse);
 }
 
 export function getRuntimeServiceCreateTriggerMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      CreateTriggerResponse,
+      V1CreateTriggerResponse,
       unknown,
       Omit<PartialMessage<CreateTriggerRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  CreateTriggerResponse,
+  V1CreateTriggerResponse,
   unknown,
   Omit<PartialMessage<CreateTriggerRequest>, "instanceId">
 > {
@@ -2355,14 +2531,14 @@ export function createRuntimeServiceCreateTriggerMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      CreateTriggerResponse,
+      V1CreateTriggerResponse,
       unknown,
       Omit<PartialMessage<CreateTriggerRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  CreateTriggerResponse,
+  V1CreateTriggerResponse,
   unknown,
   Omit<PartialMessage<CreateTriggerRequest>, "instanceId">
 > {
@@ -2379,24 +2555,28 @@ export function createRuntimeServiceCreateTriggerMutation(
 export function runtimeServiceShareConversation(
   client: RuntimeClient,
   request: Omit<PartialMessage<ShareConversationRequest>, "instanceId">,
-): Promise<ShareConversationResponse> {
-  return client.runtimeService.shareConversation({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1ShareConversationResponse> {
+  return client.runtimeService
+    .shareConversation(
+      ShareConversationRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1ShareConversationResponse);
 }
 
 export function getRuntimeServiceShareConversationMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ShareConversationResponse,
+      V1ShareConversationResponse,
       unknown,
       Omit<PartialMessage<ShareConversationRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  ShareConversationResponse,
+  V1ShareConversationResponse,
   unknown,
   Omit<PartialMessage<ShareConversationRequest>, "instanceId">
 > {
@@ -2410,14 +2590,14 @@ export function createRuntimeServiceShareConversationMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ShareConversationResponse,
+      V1ShareConversationResponse,
       unknown,
       Omit<PartialMessage<ShareConversationRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  ShareConversationResponse,
+  V1ShareConversationResponse,
   unknown,
   Omit<PartialMessage<ShareConversationRequest>, "instanceId">
 > {
@@ -2434,24 +2614,28 @@ export function createRuntimeServiceShareConversationMutation(
 export function runtimeServiceForkConversation(
   client: RuntimeClient,
   request: Omit<PartialMessage<ForkConversationRequest>, "instanceId">,
-): Promise<ForkConversationResponse> {
-  return client.runtimeService.forkConversation({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1ForkConversationResponse> {
+  return client.runtimeService
+    .forkConversation(
+      ForkConversationRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1ForkConversationResponse);
 }
 
 export function getRuntimeServiceForkConversationMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ForkConversationResponse,
+      V1ForkConversationResponse,
       unknown,
       Omit<PartialMessage<ForkConversationRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  ForkConversationResponse,
+  V1ForkConversationResponse,
   unknown,
   Omit<PartialMessage<ForkConversationRequest>, "instanceId">
 > {
@@ -2465,14 +2649,14 @@ export function createRuntimeServiceForkConversationMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      ForkConversationResponse,
+      V1ForkConversationResponse,
       unknown,
       Omit<PartialMessage<ForkConversationRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  ForkConversationResponse,
+  V1ForkConversationResponse,
   unknown,
   Omit<PartialMessage<ForkConversationRequest>, "instanceId">
 > {
@@ -2489,24 +2673,28 @@ export function createRuntimeServiceForkConversationMutation(
 export function runtimeServiceComplete(
   client: RuntimeClient,
   request: Omit<PartialMessage<CompleteRequest>, "instanceId">,
-): Promise<CompleteResponse> {
-  return client.runtimeService.complete({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1CompleteResponse> {
+  return client.runtimeService
+    .complete(
+      CompleteRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1CompleteResponse);
 }
 
 export function getRuntimeServiceCompleteMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      CompleteResponse,
+      V1CompleteResponse,
       unknown,
       Omit<PartialMessage<CompleteRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  CompleteResponse,
+  V1CompleteResponse,
   unknown,
   Omit<PartialMessage<CompleteRequest>, "instanceId">
 > {
@@ -2520,14 +2708,14 @@ export function createRuntimeServiceCompleteMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      CompleteResponse,
+      V1CompleteResponse,
       unknown,
       Omit<PartialMessage<CompleteRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  CompleteResponse,
+  V1CompleteResponse,
   unknown,
   Omit<PartialMessage<CompleteRequest>, "instanceId">
 > {
@@ -2544,24 +2732,28 @@ export function createRuntimeServiceCompleteMutation(
 export function runtimeServiceGitStatus(
   client: RuntimeClient,
   request: Omit<PartialMessage<GitStatusRequest>, "instanceId">,
-): Promise<GitStatusResponse> {
-  return client.runtimeService.gitStatus({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GitStatusResponse> {
+  return client.runtimeService
+    .gitStatus(
+      GitStatusRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GitStatusResponse);
 }
 
 export function getRuntimeServiceGitStatusMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitStatusResponse,
+      V1GitStatusResponse,
       unknown,
       Omit<PartialMessage<GitStatusRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GitStatusResponse,
+  V1GitStatusResponse,
   unknown,
   Omit<PartialMessage<GitStatusRequest>, "instanceId">
 > {
@@ -2575,14 +2767,14 @@ export function createRuntimeServiceGitStatusMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitStatusResponse,
+      V1GitStatusResponse,
       unknown,
       Omit<PartialMessage<GitStatusRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GitStatusResponse,
+  V1GitStatusResponse,
   unknown,
   Omit<PartialMessage<GitStatusRequest>, "instanceId">
 > {
@@ -2599,24 +2791,28 @@ export function createRuntimeServiceGitStatusMutation(
 export function runtimeServiceGitCommit(
   client: RuntimeClient,
   request: Omit<PartialMessage<GitCommitRequest>, "instanceId">,
-): Promise<GitCommitResponse> {
-  return client.runtimeService.gitCommit({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GitCommitResponse> {
+  return client.runtimeService
+    .gitCommit(
+      GitCommitRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GitCommitResponse);
 }
 
 export function getRuntimeServiceGitCommitMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitCommitResponse,
+      V1GitCommitResponse,
       unknown,
       Omit<PartialMessage<GitCommitRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GitCommitResponse,
+  V1GitCommitResponse,
   unknown,
   Omit<PartialMessage<GitCommitRequest>, "instanceId">
 > {
@@ -2630,14 +2826,14 @@ export function createRuntimeServiceGitCommitMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitCommitResponse,
+      V1GitCommitResponse,
       unknown,
       Omit<PartialMessage<GitCommitRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GitCommitResponse,
+  V1GitCommitResponse,
   unknown,
   Omit<PartialMessage<GitCommitRequest>, "instanceId">
 > {
@@ -2654,24 +2850,28 @@ export function createRuntimeServiceGitCommitMutation(
 export function runtimeServiceRestoreGitCommit(
   client: RuntimeClient,
   request: Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">,
-): Promise<RestoreGitCommitResponse> {
-  return client.runtimeService.restoreGitCommit({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1RestoreGitCommitResponse> {
+  return client.runtimeService
+    .restoreGitCommit(
+      RestoreGitCommitRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1RestoreGitCommitResponse);
 }
 
 export function getRuntimeServiceRestoreGitCommitMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      RestoreGitCommitResponse,
+      V1RestoreGitCommitResponse,
       unknown,
       Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  RestoreGitCommitResponse,
+  V1RestoreGitCommitResponse,
   unknown,
   Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">
 > {
@@ -2685,14 +2885,14 @@ export function createRuntimeServiceRestoreGitCommitMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      RestoreGitCommitResponse,
+      V1RestoreGitCommitResponse,
       unknown,
       Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  RestoreGitCommitResponse,
+  V1RestoreGitCommitResponse,
   unknown,
   Omit<PartialMessage<RestoreGitCommitRequest>, "instanceId">
 > {
@@ -2709,24 +2909,28 @@ export function createRuntimeServiceRestoreGitCommitMutation(
 export function runtimeServiceGitMergeToBranch(
   client: RuntimeClient,
   request: Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">,
-): Promise<GitMergeToBranchResponse> {
-  return client.runtimeService.gitMergeToBranch({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GitMergeToBranchResponse> {
+  return client.runtimeService
+    .gitMergeToBranch(
+      GitMergeToBranchRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GitMergeToBranchResponse);
 }
 
 export function getRuntimeServiceGitMergeToBranchMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitMergeToBranchResponse,
+      V1GitMergeToBranchResponse,
       unknown,
       Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GitMergeToBranchResponse,
+  V1GitMergeToBranchResponse,
   unknown,
   Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">
 > {
@@ -2740,14 +2944,14 @@ export function createRuntimeServiceGitMergeToBranchMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitMergeToBranchResponse,
+      V1GitMergeToBranchResponse,
       unknown,
       Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GitMergeToBranchResponse,
+  V1GitMergeToBranchResponse,
   unknown,
   Omit<PartialMessage<GitMergeToBranchRequest>, "instanceId">
 > {
@@ -2764,24 +2968,28 @@ export function createRuntimeServiceGitMergeToBranchMutation(
 export function runtimeServiceGitSwitchBranch(
   client: RuntimeClient,
   request: Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">,
-): Promise<GitSwitchBranchResponse> {
-  return client.runtimeService.gitSwitchBranch({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GitSwitchBranchResponse> {
+  return client.runtimeService
+    .gitSwitchBranch(
+      GitSwitchBranchRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GitSwitchBranchResponse);
 }
 
 export function getRuntimeServiceGitSwitchBranchMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitSwitchBranchResponse,
+      V1GitSwitchBranchResponse,
       unknown,
       Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GitSwitchBranchResponse,
+  V1GitSwitchBranchResponse,
   unknown,
   Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">
 > {
@@ -2795,14 +3003,14 @@ export function createRuntimeServiceGitSwitchBranchMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitSwitchBranchResponse,
+      V1GitSwitchBranchResponse,
       unknown,
       Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GitSwitchBranchResponse,
+  V1GitSwitchBranchResponse,
   unknown,
   Omit<PartialMessage<GitSwitchBranchRequest>, "instanceId">
 > {
@@ -2819,24 +3027,28 @@ export function createRuntimeServiceGitSwitchBranchMutation(
 export function runtimeServiceGitPull(
   client: RuntimeClient,
   request: Omit<PartialMessage<GitPullRequest>, "instanceId">,
-): Promise<GitPullResponse> {
-  return client.runtimeService.gitPull({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GitPullResponse> {
+  return client.runtimeService
+    .gitPull(
+      GitPullRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GitPullResponse);
 }
 
 export function getRuntimeServiceGitPullMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitPullResponse,
+      V1GitPullResponse,
       unknown,
       Omit<PartialMessage<GitPullRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GitPullResponse,
+  V1GitPullResponse,
   unknown,
   Omit<PartialMessage<GitPullRequest>, "instanceId">
 > {
@@ -2850,14 +3062,14 @@ export function createRuntimeServiceGitPullMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitPullResponse,
+      V1GitPullResponse,
       unknown,
       Omit<PartialMessage<GitPullRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GitPullResponse,
+  V1GitPullResponse,
   unknown,
   Omit<PartialMessage<GitPullRequest>, "instanceId">
 > {
@@ -2874,24 +3086,28 @@ export function createRuntimeServiceGitPullMutation(
 export function runtimeServiceGitPush(
   client: RuntimeClient,
   request: Omit<PartialMessage<GitPushRequest>, "instanceId">,
-): Promise<GitPushResponse> {
-  return client.runtimeService.gitPush({
-    instanceId: client.instanceId,
-    ...request,
-  });
+): Promise<V1GitPushResponse> {
+  return client.runtimeService
+    .gitPush(
+      GitPushRequest.fromJson({
+        instanceId: client.instanceId,
+        ...request,
+      } as unknown as JsonValue),
+    )
+    .then((r) => r.toJson() as unknown as V1GitPushResponse);
 }
 
 export function getRuntimeServiceGitPushMutationOptions(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitPushResponse,
+      V1GitPushResponse,
       unknown,
       Omit<PartialMessage<GitPushRequest>, "instanceId">
     >
   >,
 ): CreateMutationOptions<
-  GitPushResponse,
+  V1GitPushResponse,
   unknown,
   Omit<PartialMessage<GitPushRequest>, "instanceId">
 > {
@@ -2905,14 +3121,14 @@ export function createRuntimeServiceGitPushMutation(
   client: RuntimeClient,
   options?: Partial<
     CreateMutationOptions<
-      GitPushResponse,
+      V1GitPushResponse,
       unknown,
       Omit<PartialMessage<GitPushRequest>, "instanceId">
     >
   >,
   queryClient?: QueryClient,
 ): CreateMutationResult<
-  GitPushResponse,
+  V1GitPushResponse,
   unknown,
   Omit<PartialMessage<GitPushRequest>, "instanceId">
 > {

From 243dd495c2b8f74b5c2c8433cc4a0ce5526fe228 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 14:53:32 +0300
Subject: [PATCH 07/27] feat: add generic TData support to v2 query hooks for
 select transforms

The generated hooks now accept a TData type parameter (defaulting to the
response type), enabling select transforms that narrow the return type.
This mirrors the Orval pattern and avoids forcing consumers to use
derived stores as workarounds.
---
 web-common/scripts/generate-query-hooks.ts    |  18 +-
 .../v2/gen/connector-service.ts               | 140 ++--
 .../runtime-client/v2/gen/query-service.ts    | 636 +++++++++++++-----
 .../runtime-client/v2/gen/runtime-service.ts  | 478 +++++++++----
 4 files changed, 907 insertions(+), 365 deletions(-)

diff --git a/web-common/scripts/generate-query-hooks.ts b/web-common/scripts/generate-query-hooks.ts
index 7a1c8a08e44..ebf1635be73 100644
--- a/web-common/scripts/generate-query-hooks.ts
+++ b/web-common/scripts/generate-query-hooks.ts
@@ -287,15 +287,15 @@ function generateServiceFile(service: ServiceDef): string {
       ``,
     );
 
-    // Tier 3: Query options
+    // Tier 3: Query options (generic TData for select support)
     lines.push(
-      `export function ${optsFnName}(`,
+      `export function ${optsFnName}<TData = ${responseType}>(`,
       `  client: RuntimeClient,`,
       `  request: ${requestType},`,
       `  options?: {`,
-      `    query?: Partial<CreateQueryOptions<${responseType}>>;`,
+      `    query?: Partial<CreateQueryOptions<${responseType}, Error, TData>>;`,
       `  },`,
-      `): CreateQueryOptions<${responseType}> & { queryKey: QueryKey } {`,
+      `): CreateQueryOptions<${responseType}, Error, TData> & { queryKey: QueryKey } {`,
       `  const queryKey = ${keyFnName}(client.instanceId, request);`,
       `  const queryFn: QueryFunction<${responseType}> = ({ signal }) =>`,
       `    ${fullName}(client, request, { signal });`,
@@ -304,21 +304,21 @@ function generateServiceFile(service: ServiceDef): string {
       `    queryFn,`,
       `    enabled: !!client.instanceId,`,
       `    ...options?.query,`,
-      `  };`,
+      `  } as CreateQueryOptions<${responseType}, Error, TData> & { queryKey: QueryKey };`,
       `}`,
       ``,
     );
 
-    // Tier 4: Convenience hook
+    // Tier 4: Convenience hook (generic TData for select support)
     lines.push(
-      `export function ${hookName}(`,
+      `export function ${hookName}<TData = ${responseType}>(`,
       `  client: RuntimeClient,`,
       `  request: ${requestType},`,
       `  options?: {`,
-      `    query?: Partial<CreateQueryOptions<${responseType}>>;`,
+      `    query?: Partial<CreateQueryOptions<${responseType}, Error, TData>>;`,
       `  },`,
       `  queryClient?: QueryClient,`,
-      `): CreateQueryResult<${responseType}> {`,
+      `): CreateQueryResult<TData, Error> {`,
       `  const queryOptions = ${optsFnName}(client, request, options);`,
       `  return createQuery(queryOptions, queryClient);`,
       `}`,
diff --git a/web-common/src/runtime-client/v2/gen/connector-service.ts b/web-common/src/runtime-client/v2/gen/connector-service.ts
index 5d7fb9087b8..648aa855528 100644
--- a/web-common/src/runtime-client/v2/gen/connector-service.ts
+++ b/web-common/src/runtime-client/v2/gen/connector-service.ts
@@ -63,13 +63,17 @@ export function getConnectorServiceListBucketsQueryKey(
   ] as const;
 }
 
-export function getConnectorServiceListBucketsQueryOptions(
+export function getConnectorServiceListBucketsQueryOptions<
+  TData = V1ListBucketsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListBucketsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListBucketsResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListBucketsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListBucketsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getConnectorServiceListBucketsQueryKey(
     client.instanceId,
     request,
@@ -81,17 +85,21 @@ export function getConnectorServiceListBucketsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListBucketsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createConnectorServiceListBuckets(
+export function createConnectorServiceListBuckets<
+  TData = V1ListBucketsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListBucketsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListBucketsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListBucketsResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListBucketsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getConnectorServiceListBucketsQueryOptions(
     client,
     request,
@@ -131,13 +139,17 @@ export function getConnectorServiceListObjectsQueryKey(
   ] as const;
 }
 
-export function getConnectorServiceListObjectsQueryOptions(
+export function getConnectorServiceListObjectsQueryOptions<
+  TData = V1ListObjectsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListObjectsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListObjectsResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListObjectsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListObjectsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getConnectorServiceListObjectsQueryKey(
     client.instanceId,
     request,
@@ -149,17 +161,21 @@ export function getConnectorServiceListObjectsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListObjectsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createConnectorServiceListObjects(
+export function createConnectorServiceListObjects<
+  TData = V1ListObjectsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListObjectsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListObjectsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListObjectsResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListObjectsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getConnectorServiceListObjectsQueryOptions(
     client,
     request,
@@ -199,13 +215,17 @@ export function getConnectorServiceOLAPListTablesQueryKey(
   ] as const;
 }
 
-export function getConnectorServiceOLAPListTablesQueryOptions(
+export function getConnectorServiceOLAPListTablesQueryOptions<
+  TData = V1OLAPListTablesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1OLAPListTablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1OLAPListTablesResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1OLAPListTablesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1OLAPListTablesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getConnectorServiceOLAPListTablesQueryKey(
     client.instanceId,
     request,
@@ -217,17 +237,21 @@ export function getConnectorServiceOLAPListTablesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1OLAPListTablesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createConnectorServiceOLAPListTables(
+export function createConnectorServiceOLAPListTables<
+  TData = V1OLAPListTablesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPListTablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1OLAPListTablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1OLAPListTablesResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1OLAPListTablesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getConnectorServiceOLAPListTablesQueryOptions(
     client,
     request,
@@ -267,13 +291,17 @@ export function getConnectorServiceOLAPGetTableQueryKey(
   ] as const;
 }
 
-export function getConnectorServiceOLAPGetTableQueryOptions(
+export function getConnectorServiceOLAPGetTableQueryOptions<
+  TData = V1OLAPGetTableResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1OLAPGetTableResponse>>;
+    query?: Partial<CreateQueryOptions<V1OLAPGetTableResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1OLAPGetTableResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1OLAPGetTableResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getConnectorServiceOLAPGetTableQueryKey(
     client.instanceId,
     request,
@@ -285,17 +313,21 @@ export function getConnectorServiceOLAPGetTableQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1OLAPGetTableResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createConnectorServiceOLAPGetTable(
+export function createConnectorServiceOLAPGetTable<
+  TData = V1OLAPGetTableResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<OLAPGetTableRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1OLAPGetTableResponse>>;
+    query?: Partial<CreateQueryOptions<V1OLAPGetTableResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1OLAPGetTableResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getConnectorServiceOLAPGetTableQueryOptions(
     client,
     request,
@@ -335,13 +367,19 @@ export function getConnectorServiceListDatabaseSchemasQueryKey(
   ] as const;
 }
 
-export function getConnectorServiceListDatabaseSchemasQueryOptions(
+export function getConnectorServiceListDatabaseSchemasQueryOptions<
+  TData = V1ListDatabaseSchemasResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListDatabaseSchemasResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListDatabaseSchemasResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ListDatabaseSchemasResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListDatabaseSchemasResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getConnectorServiceListDatabaseSchemasQueryKey(
     client.instanceId,
     request,
@@ -353,17 +391,23 @@ export function getConnectorServiceListDatabaseSchemasQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListDatabaseSchemasResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createConnectorServiceListDatabaseSchemas(
+export function createConnectorServiceListDatabaseSchemas<
+  TData = V1ListDatabaseSchemasResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListDatabaseSchemasRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListDatabaseSchemasResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListDatabaseSchemasResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListDatabaseSchemasResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getConnectorServiceListDatabaseSchemasQueryOptions(
     client,
     request,
@@ -398,13 +442,17 @@ export function getConnectorServiceListTablesQueryKey(
   return ["ConnectorService", "listTables", instanceId, request ?? {}] as const;
 }
 
-export function getConnectorServiceListTablesQueryOptions(
+export function getConnectorServiceListTablesQueryOptions<
+  TData = V1ListTablesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListTablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListTablesResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListTablesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListTablesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getConnectorServiceListTablesQueryKey(
     client.instanceId,
     request,
@@ -416,17 +464,19 @@ export function getConnectorServiceListTablesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListTablesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createConnectorServiceListTables(
+export function createConnectorServiceListTables<TData = V1ListTablesResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListTablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListTablesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListTablesResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListTablesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getConnectorServiceListTablesQueryOptions(
     client,
     request,
@@ -461,13 +511,17 @@ export function getConnectorServiceGetTableQueryKey(
   return ["ConnectorService", "getTable", instanceId, request ?? {}] as const;
 }
 
-export function getConnectorServiceGetTableQueryOptions(
+export function getConnectorServiceGetTableQueryOptions<
+  TData = V1GetTableResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetTableRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetTableResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetTableResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1GetTableResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetTableResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getConnectorServiceGetTableQueryKey(
     client.instanceId,
     request,
@@ -479,17 +533,19 @@ export function getConnectorServiceGetTableQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1GetTableResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createConnectorServiceGetTable(
+export function createConnectorServiceGetTable<TData = V1GetTableResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetTableRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetTableResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetTableResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1GetTableResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getConnectorServiceGetTableQueryOptions(
     client,
     request,
diff --git a/web-common/src/runtime-client/v2/gen/query-service.ts b/web-common/src/runtime-client/v2/gen/query-service.ts
index 084ddfe39b3..379f3b1cdfa 100644
--- a/web-common/src/runtime-client/v2/gen/query-service.ts
+++ b/web-common/src/runtime-client/v2/gen/query-service.ts
@@ -130,13 +130,17 @@ export function getQueryServiceMetricsViewAggregationQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewAggregationQueryOptions(
+export function getQueryServiceMetricsViewAggregationQueryOptions<
+  TData = V1MetricsViewAggregationResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewAggregationRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewAggregationResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewAggregationResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewAggregationResponse> & {
+): CreateQueryOptions<V1MetricsViewAggregationResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceMetricsViewAggregationQueryKey(
@@ -151,17 +155,23 @@ export function getQueryServiceMetricsViewAggregationQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewAggregationResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewAggregation(
+export function createQueryServiceMetricsViewAggregation<
+  TData = V1MetricsViewAggregationResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewAggregationRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewAggregationResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewAggregationResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewAggregationResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewAggregationQueryOptions(
     client,
     request,
@@ -201,13 +211,19 @@ export function getQueryServiceMetricsViewToplistQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewToplistQueryOptions(
+export function getQueryServiceMetricsViewToplistQueryOptions<
+  TData = V1MetricsViewToplistResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewToplistRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewToplistResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewToplistResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewToplistResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewToplistResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewToplistQueryKey(
     client.instanceId,
     request,
@@ -219,17 +235,23 @@ export function getQueryServiceMetricsViewToplistQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewToplistResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewToplist(
+export function createQueryServiceMetricsViewToplist<
+  TData = V1MetricsViewToplistResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewToplistRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewToplistResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewToplistResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewToplistResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewToplistQueryOptions(
     client,
     request,
@@ -269,13 +291,17 @@ export function getQueryServiceMetricsViewComparisonQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewComparisonQueryOptions(
+export function getQueryServiceMetricsViewComparisonQueryOptions<
+  TData = V1MetricsViewComparisonResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewComparisonRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewComparisonResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewComparisonResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewComparisonResponse> & {
+): CreateQueryOptions<V1MetricsViewComparisonResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceMetricsViewComparisonQueryKey(
@@ -290,17 +316,23 @@ export function getQueryServiceMetricsViewComparisonQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewComparisonResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewComparison(
+export function createQueryServiceMetricsViewComparison<
+  TData = V1MetricsViewComparisonResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewComparisonRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewComparisonResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewComparisonResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewComparisonResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewComparisonQueryOptions(
     client,
     request,
@@ -340,13 +372,17 @@ export function getQueryServiceMetricsViewTimeSeriesQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewTimeSeriesQueryOptions(
+export function getQueryServiceMetricsViewTimeSeriesQueryOptions<
+  TData = V1MetricsViewTimeSeriesResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewTimeSeriesRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewTimeSeriesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewTimeSeriesResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewTimeSeriesResponse> & {
+): CreateQueryOptions<V1MetricsViewTimeSeriesResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceMetricsViewTimeSeriesQueryKey(
@@ -361,17 +397,23 @@ export function getQueryServiceMetricsViewTimeSeriesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewTimeSeriesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewTimeSeries(
+export function createQueryServiceMetricsViewTimeSeries<
+  TData = V1MetricsViewTimeSeriesResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewTimeSeriesRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewTimeSeriesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewTimeSeriesResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewTimeSeriesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewTimeSeriesQueryOptions(
     client,
     request,
@@ -411,13 +453,19 @@ export function getQueryServiceMetricsViewTotalsQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewTotalsQueryOptions(
+export function getQueryServiceMetricsViewTotalsQueryOptions<
+  TData = V1MetricsViewTotalsResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewTotalsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewTotalsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewTotalsResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewTotalsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewTotalsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewTotalsQueryKey(
     client.instanceId,
     request,
@@ -429,17 +477,23 @@ export function getQueryServiceMetricsViewTotalsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewTotalsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewTotals(
+export function createQueryServiceMetricsViewTotals<
+  TData = V1MetricsViewTotalsResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewTotalsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewTotalsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewTotalsResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewTotalsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewTotalsQueryOptions(
     client,
     request,
@@ -479,13 +533,19 @@ export function getQueryServiceMetricsViewRowsQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewRowsQueryOptions(
+export function getQueryServiceMetricsViewRowsQueryOptions<
+  TData = V1MetricsViewRowsResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewRowsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewRowsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewRowsResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewRowsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewRowsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewRowsQueryKey(
     client.instanceId,
     request,
@@ -497,17 +557,23 @@ export function getQueryServiceMetricsViewRowsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewRowsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewRows(
+export function createQueryServiceMetricsViewRows<
+  TData = V1MetricsViewRowsResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1MetricsViewRowsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewRowsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewRowsResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewRowsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewRowsQueryOptions(
     client,
     request,
@@ -547,13 +613,19 @@ export function getQueryServiceMetricsViewTimeRangeQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewTimeRangeQueryOptions(
+export function getQueryServiceMetricsViewTimeRangeQueryOptions<
+  TData = V1MetricsViewTimeRangeResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewTimeRangeResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewTimeRangeResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewTimeRangeResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewTimeRangeResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewTimeRangeQueryKey(
     client.instanceId,
     request,
@@ -565,17 +637,23 @@ export function getQueryServiceMetricsViewTimeRangeQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewTimeRangeResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewTimeRange(
+export function createQueryServiceMetricsViewTimeRange<
+  TData = V1MetricsViewTimeRangeResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangeRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewTimeRangeResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewTimeRangeResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewTimeRangeResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewTimeRangeQueryOptions(
     client,
     request,
@@ -615,13 +693,19 @@ export function getQueryServiceMetricsViewSchemaQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewSchemaQueryOptions(
+export function getQueryServiceMetricsViewSchemaQueryOptions<
+  TData = V1MetricsViewSchemaResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewSchemaResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewSchemaResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewSchemaResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewSchemaResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewSchemaQueryKey(
     client.instanceId,
     request,
@@ -633,17 +717,23 @@ export function getQueryServiceMetricsViewSchemaQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewSchemaResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewSchema(
+export function createQueryServiceMetricsViewSchema<
+  TData = V1MetricsViewSchemaResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSchemaRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewSchemaResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewSchemaResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewSchemaResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewSchemaQueryOptions(
     client,
     request,
@@ -683,13 +773,19 @@ export function getQueryServiceMetricsViewSearchQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewSearchQueryOptions(
+export function getQueryServiceMetricsViewSearchQueryOptions<
+  TData = V1MetricsViewSearchResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewSearchResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewSearchResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewSearchResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1MetricsViewSearchResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceMetricsViewSearchQueryKey(
     client.instanceId,
     request,
@@ -701,17 +797,23 @@ export function getQueryServiceMetricsViewSearchQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewSearchResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewSearch(
+export function createQueryServiceMetricsViewSearch<
+  TData = V1MetricsViewSearchResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewSearchRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewSearchResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewSearchResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewSearchResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewSearchQueryOptions(
     client,
     request,
@@ -751,13 +853,17 @@ export function getQueryServiceMetricsViewTimeRangesQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewTimeRangesQueryOptions(
+export function getQueryServiceMetricsViewTimeRangesQueryOptions<
+  TData = V1MetricsViewTimeRangesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewTimeRangesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewTimeRangesResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewTimeRangesResponse> & {
+): CreateQueryOptions<V1MetricsViewTimeRangesResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceMetricsViewTimeRangesQueryKey(
@@ -772,17 +878,23 @@ export function getQueryServiceMetricsViewTimeRangesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewTimeRangesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewTimeRanges(
+export function createQueryServiceMetricsViewTimeRanges<
+  TData = V1MetricsViewTimeRangesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewTimeRangesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewTimeRangesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewTimeRangesResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewTimeRangesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewTimeRangesQueryOptions(
     client,
     request,
@@ -822,13 +934,17 @@ export function getQueryServiceMetricsViewAnnotationsQueryKey(
   ] as const;
 }
 
-export function getQueryServiceMetricsViewAnnotationsQueryOptions(
+export function getQueryServiceMetricsViewAnnotationsQueryOptions<
+  TData = V1MetricsViewAnnotationsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewAnnotationsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewAnnotationsResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1MetricsViewAnnotationsResponse> & {
+): CreateQueryOptions<V1MetricsViewAnnotationsResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceMetricsViewAnnotationsQueryKey(
@@ -843,17 +959,23 @@ export function getQueryServiceMetricsViewAnnotationsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1MetricsViewAnnotationsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceMetricsViewAnnotations(
+export function createQueryServiceMetricsViewAnnotations<
+  TData = V1MetricsViewAnnotationsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<MetricsViewAnnotationsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1MetricsViewAnnotationsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1MetricsViewAnnotationsResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1MetricsViewAnnotationsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceMetricsViewAnnotationsQueryOptions(
     client,
     request,
@@ -901,7 +1023,9 @@ export function getQueryServiceConvertExpressionToMetricsSQLQueryKey(
   ] as const;
 }
 
-export function getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
+export function getQueryServiceConvertExpressionToMetricsSQLQueryOptions<
+  TData = V1ConvertExpressionToMetricsSQLResponse,
+>(
   client: RuntimeClient,
   request: Omit<
     PartialMessage<ConvertExpressionToMetricsSQLRequest>,
@@ -909,10 +1033,10 @@ export function getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
   >,
   options?: {
     query?: Partial<
-      CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse>
+      CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse, Error, TData>
     >;
   },
-): CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse> & {
+): CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceConvertExpressionToMetricsSQLQueryKey(
@@ -927,10 +1051,16 @@ export function getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
-  };
+  } as CreateQueryOptions<
+    V1ConvertExpressionToMetricsSQLResponse,
+    Error,
+    TData
+  > & { queryKey: QueryKey };
 }
 
-export function createQueryServiceConvertExpressionToMetricsSQL(
+export function createQueryServiceConvertExpressionToMetricsSQL<
+  TData = V1ConvertExpressionToMetricsSQLResponse,
+>(
   client: RuntimeClient,
   request: Omit<
     PartialMessage<ConvertExpressionToMetricsSQLRequest>,
@@ -938,11 +1068,11 @@ export function createQueryServiceConvertExpressionToMetricsSQL(
   >,
   options?: {
     query?: Partial<
-      CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse>
+      CreateQueryOptions<V1ConvertExpressionToMetricsSQLResponse, Error, TData>
     >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ConvertExpressionToMetricsSQLResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceConvertExpressionToMetricsSQLQueryOptions(
     client,
     request,
@@ -977,13 +1107,17 @@ export function getQueryServiceResolveCanvasQueryKey(
   return ["QueryService", "resolveCanvas", instanceId, request ?? {}] as const;
 }
 
-export function getQueryServiceResolveCanvasQueryOptions(
+export function getQueryServiceResolveCanvasQueryOptions<
+  TData = V1ResolveCanvasResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ResolveCanvasResponse>>;
+    query?: Partial<CreateQueryOptions<V1ResolveCanvasResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ResolveCanvasResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ResolveCanvasResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceResolveCanvasQueryKey(
     client.instanceId,
     request,
@@ -995,17 +1129,21 @@ export function getQueryServiceResolveCanvasQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ResolveCanvasResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceResolveCanvas(
+export function createQueryServiceResolveCanvas<
+  TData = V1ResolveCanvasResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveCanvasRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ResolveCanvasResponse>>;
+    query?: Partial<CreateQueryOptions<V1ResolveCanvasResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ResolveCanvasResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceResolveCanvasQueryOptions(
     client,
     request,
@@ -1045,13 +1183,19 @@ export function getQueryServiceResolveComponentQueryKey(
   ] as const;
 }
 
-export function getQueryServiceResolveComponentQueryOptions(
+export function getQueryServiceResolveComponentQueryOptions<
+  TData = V1ResolveComponentResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ResolveComponentResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ResolveComponentResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ResolveComponentResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ResolveComponentResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceResolveComponentQueryKey(
     client.instanceId,
     request,
@@ -1063,17 +1207,23 @@ export function getQueryServiceResolveComponentQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ResolveComponentResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceResolveComponent(
+export function createQueryServiceResolveComponent<
+  TData = V1ResolveComponentResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveComponentRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ResolveComponentResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ResolveComponentResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ResolveComponentResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceResolveComponentQueryOptions(
     client,
     request,
@@ -1113,13 +1263,17 @@ export function getQueryServiceResolveTemplatedStringQueryKey(
   ] as const;
 }
 
-export function getQueryServiceResolveTemplatedStringQueryOptions(
+export function getQueryServiceResolveTemplatedStringQueryOptions<
+  TData = V1ResolveTemplatedStringResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ResolveTemplatedStringResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ResolveTemplatedStringResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ResolveTemplatedStringResponse> & {
+): CreateQueryOptions<V1ResolveTemplatedStringResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceResolveTemplatedStringQueryKey(
@@ -1134,17 +1288,23 @@ export function getQueryServiceResolveTemplatedStringQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ResolveTemplatedStringResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceResolveTemplatedString(
+export function createQueryServiceResolveTemplatedString<
+  TData = V1ResolveTemplatedStringResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ResolveTemplatedStringRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ResolveTemplatedStringResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ResolveTemplatedStringResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ResolveTemplatedStringResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceResolveTemplatedStringQueryOptions(
     client,
     request,
@@ -1184,13 +1344,19 @@ export function getQueryServiceColumnRollupIntervalQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnRollupIntervalQueryOptions(
+export function getQueryServiceColumnRollupIntervalQueryOptions<
+  TData = V1ColumnRollupIntervalResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnRollupIntervalRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnRollupIntervalResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnRollupIntervalResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnRollupIntervalResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnRollupIntervalResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnRollupIntervalQueryKey(
     client.instanceId,
     request,
@@ -1202,17 +1368,23 @@ export function getQueryServiceColumnRollupIntervalQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnRollupIntervalResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnRollupInterval(
+export function createQueryServiceColumnRollupInterval<
+  TData = V1ColumnRollupIntervalResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnRollupIntervalRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnRollupIntervalResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnRollupIntervalResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnRollupIntervalResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnRollupIntervalQueryOptions(
     client,
     request,
@@ -1247,13 +1419,17 @@ export function getQueryServiceColumnTopKQueryKey(
   return ["QueryService", "columnTopK", instanceId, request ?? {}] as const;
 }
 
-export function getQueryServiceColumnTopKQueryOptions(
+export function getQueryServiceColumnTopKQueryOptions<
+  TData = V1ColumnTopKResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnTopKRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnTopKResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTopKResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ColumnTopKResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnTopKResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnTopKQueryKey(
     client.instanceId,
     request,
@@ -1265,17 +1441,19 @@ export function getQueryServiceColumnTopKQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnTopKResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnTopK(
+export function createQueryServiceColumnTopK<TData = V1ColumnTopKResponse>(
   client: RuntimeClient,
   request: Omit<V1ColumnTopKRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnTopKResponse>>;
+    query?: Partial<CreateQueryOptions<V1ColumnTopKResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnTopKResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnTopKQueryOptions(
     client,
     request,
@@ -1315,13 +1493,19 @@ export function getQueryServiceColumnNullCountQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnNullCountQueryOptions(
+export function getQueryServiceColumnNullCountQueryOptions<
+  TData = V1ColumnNullCountResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnNullCountRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnNullCountResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnNullCountResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnNullCountResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnNullCountResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnNullCountQueryKey(
     client.instanceId,
     request,
@@ -1333,17 +1517,23 @@ export function getQueryServiceColumnNullCountQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnNullCountResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnNullCount(
+export function createQueryServiceColumnNullCount<
+  TData = V1ColumnNullCountResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnNullCountRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnNullCountResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnNullCountResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnNullCountResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnNullCountQueryOptions(
     client,
     request,
@@ -1385,13 +1575,17 @@ export function getQueryServiceColumnDescriptiveStatisticsQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnDescriptiveStatisticsQueryOptions(
+export function getQueryServiceColumnDescriptiveStatisticsQueryOptions<
+  TData = V1ColumnDescriptiveStatisticsResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnDescriptiveStatisticsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse> & {
+): CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceColumnDescriptiveStatisticsQueryKey(
@@ -1406,17 +1600,25 @@ export function getQueryServiceColumnDescriptiveStatisticsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
-  };
+  } as CreateQueryOptions<
+    V1ColumnDescriptiveStatisticsResponse,
+    Error,
+    TData
+  > & { queryKey: QueryKey };
 }
 
-export function createQueryServiceColumnDescriptiveStatistics(
+export function createQueryServiceColumnDescriptiveStatistics<
+  TData = V1ColumnDescriptiveStatisticsResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnDescriptiveStatisticsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnDescriptiveStatisticsResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnDescriptiveStatisticsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnDescriptiveStatisticsQueryOptions(
     client,
     request,
@@ -1456,13 +1658,19 @@ export function getQueryServiceColumnTimeGrainQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnTimeGrainQueryOptions(
+export function getQueryServiceColumnTimeGrainQueryOptions<
+  TData = V1ColumnTimeGrainResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnTimeGrainRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnTimeGrainResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnTimeGrainResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnTimeGrainResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnTimeGrainResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnTimeGrainQueryKey(
     client.instanceId,
     request,
@@ -1474,17 +1682,23 @@ export function getQueryServiceColumnTimeGrainQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnTimeGrainResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnTimeGrain(
+export function createQueryServiceColumnTimeGrain<
+  TData = V1ColumnTimeGrainResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnTimeGrainRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnTimeGrainResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnTimeGrainResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnTimeGrainResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnTimeGrainQueryOptions(
     client,
     request,
@@ -1524,13 +1738,17 @@ export function getQueryServiceColumnNumericHistogramQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnNumericHistogramQueryOptions(
+export function getQueryServiceColumnNumericHistogramQueryOptions<
+  TData = V1ColumnNumericHistogramResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnNumericHistogramRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnNumericHistogramResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnNumericHistogramResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnNumericHistogramResponse> & {
+): CreateQueryOptions<V1ColumnNumericHistogramResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getQueryServiceColumnNumericHistogramQueryKey(
@@ -1545,17 +1763,23 @@ export function getQueryServiceColumnNumericHistogramQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnNumericHistogramResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnNumericHistogram(
+export function createQueryServiceColumnNumericHistogram<
+  TData = V1ColumnNumericHistogramResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnNumericHistogramRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnNumericHistogramResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnNumericHistogramResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnNumericHistogramResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnNumericHistogramQueryOptions(
     client,
     request,
@@ -1595,13 +1819,19 @@ export function getQueryServiceColumnRugHistogramQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnRugHistogramQueryOptions(
+export function getQueryServiceColumnRugHistogramQueryOptions<
+  TData = V1ColumnRugHistogramResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnRugHistogramRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnRugHistogramResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnRugHistogramResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnRugHistogramResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnRugHistogramResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnRugHistogramQueryKey(
     client.instanceId,
     request,
@@ -1613,17 +1843,23 @@ export function getQueryServiceColumnRugHistogramQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnRugHistogramResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnRugHistogram(
+export function createQueryServiceColumnRugHistogram<
+  TData = V1ColumnRugHistogramResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnRugHistogramRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnRugHistogramResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnRugHistogramResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnRugHistogramResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnRugHistogramQueryOptions(
     client,
     request,
@@ -1663,13 +1899,19 @@ export function getQueryServiceColumnTimeRangeQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnTimeRangeQueryOptions(
+export function getQueryServiceColumnTimeRangeQueryOptions<
+  TData = V1ColumnTimeRangeResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnTimeRangeRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnTimeRangeResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnTimeRangeResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnTimeRangeResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnTimeRangeResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnTimeRangeQueryKey(
     client.instanceId,
     request,
@@ -1681,17 +1923,23 @@ export function getQueryServiceColumnTimeRangeQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnTimeRangeResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnTimeRange(
+export function createQueryServiceColumnTimeRange<
+  TData = V1ColumnTimeRangeResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnTimeRangeRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnTimeRangeResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnTimeRangeResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnTimeRangeResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnTimeRangeQueryOptions(
     client,
     request,
@@ -1731,13 +1979,19 @@ export function getQueryServiceColumnCardinalityQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnCardinalityQueryOptions(
+export function getQueryServiceColumnCardinalityQueryOptions<
+  TData = V1ColumnCardinalityResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnCardinalityRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnCardinalityResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnCardinalityResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnCardinalityResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnCardinalityResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnCardinalityQueryKey(
     client.instanceId,
     request,
@@ -1749,17 +2003,23 @@ export function getQueryServiceColumnCardinalityQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnCardinalityResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnCardinality(
+export function createQueryServiceColumnCardinality<
+  TData = V1ColumnCardinalityResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnCardinalityRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnCardinalityResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnCardinalityResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnCardinalityResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnCardinalityQueryOptions(
     client,
     request,
@@ -1799,13 +2059,19 @@ export function getQueryServiceColumnTimeSeriesQueryKey(
   ] as const;
 }
 
-export function getQueryServiceColumnTimeSeriesQueryOptions(
+export function getQueryServiceColumnTimeSeriesQueryOptions<
+  TData = V1ColumnTimeSeriesResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnTimeSeriesRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnTimeSeriesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnTimeSeriesResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ColumnTimeSeriesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ColumnTimeSeriesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceColumnTimeSeriesQueryKey(
     client.instanceId,
     request,
@@ -1817,17 +2083,23 @@ export function getQueryServiceColumnTimeSeriesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ColumnTimeSeriesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceColumnTimeSeries(
+export function createQueryServiceColumnTimeSeries<
+  TData = V1ColumnTimeSeriesResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1ColumnTimeSeriesRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ColumnTimeSeriesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ColumnTimeSeriesResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ColumnTimeSeriesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceColumnTimeSeriesQueryOptions(
     client,
     request,
@@ -1867,13 +2139,19 @@ export function getQueryServiceTableCardinalityQueryKey(
   ] as const;
 }
 
-export function getQueryServiceTableCardinalityQueryOptions(
+export function getQueryServiceTableCardinalityQueryOptions<
+  TData = V1TableCardinalityResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1TableCardinalityRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1TableCardinalityResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1TableCardinalityResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1TableCardinalityResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1TableCardinalityResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceTableCardinalityQueryKey(
     client.instanceId,
     request,
@@ -1885,17 +2163,23 @@ export function getQueryServiceTableCardinalityQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1TableCardinalityResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceTableCardinality(
+export function createQueryServiceTableCardinality<
+  TData = V1TableCardinalityResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1TableCardinalityRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1TableCardinalityResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1TableCardinalityResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1TableCardinalityResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceTableCardinalityQueryOptions(
     client,
     request,
@@ -1930,13 +2214,17 @@ export function getQueryServiceTableColumnsQueryKey(
   return ["QueryService", "tableColumns", instanceId, request ?? {}] as const;
 }
 
-export function getQueryServiceTableColumnsQueryOptions(
+export function getQueryServiceTableColumnsQueryOptions<
+  TData = V1TableColumnsResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1TableColumnsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1TableColumnsResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableColumnsResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1TableColumnsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1TableColumnsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceTableColumnsQueryKey(
     client.instanceId,
     request,
@@ -1948,17 +2236,19 @@ export function getQueryServiceTableColumnsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1TableColumnsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceTableColumns(
+export function createQueryServiceTableColumns<TData = V1TableColumnsResponse>(
   client: RuntimeClient,
   request: Omit<V1TableColumnsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1TableColumnsResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableColumnsResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1TableColumnsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceTableColumnsQueryOptions(
     client,
     request,
@@ -1993,13 +2283,17 @@ export function getQueryServiceTableRowsQueryKey(
   return ["QueryService", "tableRows", instanceId, request ?? {}] as const;
 }
 
-export function getQueryServiceTableRowsQueryOptions(
+export function getQueryServiceTableRowsQueryOptions<
+  TData = V1TableRowsResponse,
+>(
   client: RuntimeClient,
   request: Omit<V1TableRowsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1TableRowsResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableRowsResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1TableRowsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1TableRowsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getQueryServiceTableRowsQueryKey(client.instanceId, request);
   const queryFn: QueryFunction<V1TableRowsResponse> = ({ signal }) =>
     queryServiceTableRows(client, request, { signal });
@@ -2008,17 +2302,19 @@ export function getQueryServiceTableRowsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1TableRowsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createQueryServiceTableRows(
+export function createQueryServiceTableRows<TData = V1TableRowsResponse>(
   client: RuntimeClient,
   request: Omit<V1TableRowsRequest, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1TableRowsResponse>>;
+    query?: Partial<CreateQueryOptions<V1TableRowsResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1TableRowsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getQueryServiceTableRowsQueryOptions(
     client,
     request,
diff --git a/web-common/src/runtime-client/v2/gen/runtime-service.ts b/web-common/src/runtime-client/v2/gen/runtime-service.ts
index fee8fd98ab3..80c398ce894 100644
--- a/web-common/src/runtime-client/v2/gen/runtime-service.ts
+++ b/web-common/src/runtime-client/v2/gen/runtime-service.ts
@@ -140,13 +140,13 @@ export function getRuntimeServicePingQueryKey(
   return ["RuntimeService", "ping", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServicePingQueryOptions(
+export function getRuntimeServicePingQueryOptions<TData = V1PingResponse>(
   client: RuntimeClient,
   request: PartialMessage<PingRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1PingResponse>>;
+    query?: Partial<CreateQueryOptions<V1PingResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1PingResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1PingResponse, Error, TData> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServicePingQueryKey(client.instanceId, request);
   const queryFn: QueryFunction<V1PingResponse> = ({ signal }) =>
     runtimeServicePing(client, request, { signal });
@@ -155,17 +155,19 @@ export function getRuntimeServicePingQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1PingResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServicePing(
+export function createRuntimeServicePing<TData = V1PingResponse>(
   client: RuntimeClient,
   request: PartialMessage<PingRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1PingResponse>>;
+    query?: Partial<CreateQueryOptions<V1PingResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1PingResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServicePingQueryOptions(
     client,
     request,
@@ -196,13 +198,13 @@ export function getRuntimeServiceHealthQueryKey(
   return ["RuntimeService", "health", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceHealthQueryOptions(
+export function getRuntimeServiceHealthQueryOptions<TData = V1HealthResponse>(
   client: RuntimeClient,
   request: PartialMessage<HealthRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1HealthResponse>>;
+    query?: Partial<CreateQueryOptions<V1HealthResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1HealthResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1HealthResponse, Error, TData> & { queryKey: QueryKey } {
   const queryKey = getRuntimeServiceHealthQueryKey(client.instanceId, request);
   const queryFn: QueryFunction<V1HealthResponse> = ({ signal }) =>
     runtimeServiceHealth(client, request, { signal });
@@ -211,17 +213,19 @@ export function getRuntimeServiceHealthQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1HealthResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceHealth(
+export function createRuntimeServiceHealth<TData = V1HealthResponse>(
   client: RuntimeClient,
   request: PartialMessage<HealthRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1HealthResponse>>;
+    query?: Partial<CreateQueryOptions<V1HealthResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1HealthResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceHealthQueryOptions(
     client,
     request,
@@ -261,13 +265,17 @@ export function getRuntimeServiceInstanceHealthQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceInstanceHealthQueryOptions(
+export function getRuntimeServiceInstanceHealthQueryOptions<
+  TData = V1InstanceHealthResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1InstanceHealthResponse>>;
+    query?: Partial<CreateQueryOptions<V1InstanceHealthResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1InstanceHealthResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1InstanceHealthResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceInstanceHealthQueryKey(
     client.instanceId,
     request,
@@ -279,17 +287,21 @@ export function getRuntimeServiceInstanceHealthQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1InstanceHealthResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceInstanceHealth(
+export function createRuntimeServiceInstanceHealth<
+  TData = V1InstanceHealthResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<InstanceHealthRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1InstanceHealthResponse>>;
+    query?: Partial<CreateQueryOptions<V1InstanceHealthResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1InstanceHealthResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceInstanceHealthQueryOptions(
     client,
     request,
@@ -326,13 +338,17 @@ export function getRuntimeServiceListInstancesQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceListInstancesQueryOptions(
+export function getRuntimeServiceListInstancesQueryOptions<
+  TData = V1ListInstancesResponse,
+>(
   client: RuntimeClient,
   request: PartialMessage<ListInstancesRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListInstancesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListInstancesResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListInstancesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListInstancesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListInstancesQueryKey(
     client.instanceId,
     request,
@@ -344,17 +360,21 @@ export function getRuntimeServiceListInstancesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListInstancesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListInstances(
+export function createRuntimeServiceListInstances<
+  TData = V1ListInstancesResponse,
+>(
   client: RuntimeClient,
   request: PartialMessage<ListInstancesRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListInstancesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListInstancesResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListInstancesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListInstancesQueryOptions(
     client,
     request,
@@ -389,13 +409,17 @@ export function getRuntimeServiceGetInstanceQueryKey(
   return ["RuntimeService", "getInstance", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceGetInstanceQueryOptions(
+export function getRuntimeServiceGetInstanceQueryOptions<
+  TData = V1GetInstanceResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetInstanceResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetInstanceResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1GetInstanceResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetInstanceResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceGetInstanceQueryKey(
     client.instanceId,
     request,
@@ -407,17 +431,19 @@ export function getRuntimeServiceGetInstanceQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1GetInstanceResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceGetInstance(
+export function createRuntimeServiceGetInstance<TData = V1GetInstanceResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetInstanceRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetInstanceResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetInstanceResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1GetInstanceResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceGetInstanceQueryOptions(
     client,
     request,
@@ -452,13 +478,17 @@ export function getRuntimeServiceListFilesQueryKey(
   return ["RuntimeService", "listFiles", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceListFilesQueryOptions(
+export function getRuntimeServiceListFilesQueryOptions<
+  TData = V1ListFilesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListFilesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListFilesResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListFilesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListFilesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListFilesQueryKey(
     client.instanceId,
     request,
@@ -470,17 +500,19 @@ export function getRuntimeServiceListFilesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListFilesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListFiles(
+export function createRuntimeServiceListFiles<TData = V1ListFilesResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListFilesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListFilesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListFilesResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListFilesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListFilesQueryOptions(
     client,
     request,
@@ -515,13 +547,15 @@ export function getRuntimeServiceGetFileQueryKey(
   return ["RuntimeService", "getFile", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceGetFileQueryOptions(
+export function getRuntimeServiceGetFileQueryOptions<TData = V1GetFileResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetFileRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetFileResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetFileResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1GetFileResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetFileResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceGetFileQueryKey(client.instanceId, request);
   const queryFn: QueryFunction<V1GetFileResponse> = ({ signal }) =>
     runtimeServiceGetFile(client, request, { signal });
@@ -530,17 +564,19 @@ export function getRuntimeServiceGetFileQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1GetFileResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceGetFile(
+export function createRuntimeServiceGetFile<TData = V1GetFileResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetFileRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetFileResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetFileResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1GetFileResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceGetFileQueryOptions(
     client,
     request,
@@ -572,13 +608,17 @@ export function getRuntimeServiceListExamplesQueryKey(
   return ["RuntimeService", "listExamples", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceListExamplesQueryOptions(
+export function getRuntimeServiceListExamplesQueryOptions<
+  TData = V1ListExamplesResponse,
+>(
   client: RuntimeClient,
   request: PartialMessage<ListExamplesRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListExamplesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListExamplesResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListExamplesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListExamplesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListExamplesQueryKey(
     client.instanceId,
     request,
@@ -590,17 +630,21 @@ export function getRuntimeServiceListExamplesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListExamplesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListExamples(
+export function createRuntimeServiceListExamples<
+  TData = V1ListExamplesResponse,
+>(
   client: RuntimeClient,
   request: PartialMessage<ListExamplesRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListExamplesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListExamplesResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListExamplesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListExamplesQueryOptions(
     client,
     request,
@@ -640,13 +684,17 @@ export function getRuntimeServiceQueryResolverQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceQueryResolverQueryOptions(
+export function getRuntimeServiceQueryResolverQueryOptions<
+  TData = V1QueryResolverResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1QueryResolverResponse>>;
+    query?: Partial<CreateQueryOptions<V1QueryResolverResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1QueryResolverResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1QueryResolverResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceQueryResolverQueryKey(
     client.instanceId,
     request,
@@ -658,17 +706,21 @@ export function getRuntimeServiceQueryResolverQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1QueryResolverResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceQueryResolver(
+export function createRuntimeServiceQueryResolver<
+  TData = V1QueryResolverResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<QueryResolverRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1QueryResolverResponse>>;
+    query?: Partial<CreateQueryOptions<V1QueryResolverResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1QueryResolverResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceQueryResolverQueryOptions(
     client,
     request,
@@ -703,13 +755,15 @@ export function getRuntimeServiceGetLogsQueryKey(
   return ["RuntimeService", "getLogs", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceGetLogsQueryOptions(
+export function getRuntimeServiceGetLogsQueryOptions<TData = V1GetLogsResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetLogsResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetLogsResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1GetLogsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetLogsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceGetLogsQueryKey(client.instanceId, request);
   const queryFn: QueryFunction<V1GetLogsResponse> = ({ signal }) =>
     runtimeServiceGetLogs(client, request, { signal });
@@ -718,17 +772,19 @@ export function getRuntimeServiceGetLogsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1GetLogsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceGetLogs(
+export function createRuntimeServiceGetLogs<TData = V1GetLogsResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetLogsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetLogsResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetLogsResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1GetLogsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceGetLogsQueryOptions(
     client,
     request,
@@ -768,13 +824,17 @@ export function getRuntimeServiceListResourcesQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceListResourcesQueryOptions(
+export function getRuntimeServiceListResourcesQueryOptions<
+  TData = V1ListResourcesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListResourcesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListResourcesResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListResourcesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListResourcesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListResourcesQueryKey(
     client.instanceId,
     request,
@@ -786,17 +846,21 @@ export function getRuntimeServiceListResourcesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListResourcesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListResources(
+export function createRuntimeServiceListResources<
+  TData = V1ListResourcesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListResourcesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListResourcesResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListResourcesResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListResourcesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListResourcesQueryOptions(
     client,
     request,
@@ -831,13 +895,17 @@ export function getRuntimeServiceGetResourceQueryKey(
   return ["RuntimeService", "getResource", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceGetResourceQueryOptions(
+export function getRuntimeServiceGetResourceQueryOptions<
+  TData = V1GetResourceResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetResourceResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetResourceResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1GetResourceResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetResourceResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceGetResourceQueryKey(
     client.instanceId,
     request,
@@ -849,17 +917,19 @@ export function getRuntimeServiceGetResourceQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1GetResourceResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceGetResource(
+export function createRuntimeServiceGetResource<TData = V1GetResourceResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetResourceRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetResourceResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetResourceResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1GetResourceResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceGetResourceQueryOptions(
     client,
     request,
@@ -894,13 +964,17 @@ export function getRuntimeServiceGetExploreQueryKey(
   return ["RuntimeService", "getExplore", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceGetExploreQueryOptions(
+export function getRuntimeServiceGetExploreQueryOptions<
+  TData = V1GetExploreResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetExploreResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetExploreResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1GetExploreResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetExploreResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceGetExploreQueryKey(
     client.instanceId,
     request,
@@ -912,17 +986,19 @@ export function getRuntimeServiceGetExploreQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1GetExploreResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceGetExplore(
+export function createRuntimeServiceGetExplore<TData = V1GetExploreResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetExploreRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetExploreResponse>>;
+    query?: Partial<CreateQueryOptions<V1GetExploreResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1GetExploreResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceGetExploreQueryOptions(
     client,
     request,
@@ -962,13 +1038,19 @@ export function getRuntimeServiceGetModelPartitionsQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceGetModelPartitionsQueryOptions(
+export function getRuntimeServiceGetModelPartitionsQueryOptions<
+  TData = V1GetModelPartitionsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetModelPartitionsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1GetModelPartitionsResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1GetModelPartitionsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetModelPartitionsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceGetModelPartitionsQueryKey(
     client.instanceId,
     request,
@@ -980,17 +1062,23 @@ export function getRuntimeServiceGetModelPartitionsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1GetModelPartitionsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceGetModelPartitions(
+export function createRuntimeServiceGetModelPartitions<
+  TData = V1GetModelPartitionsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetModelPartitionsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetModelPartitionsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1GetModelPartitionsResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1GetModelPartitionsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceGetModelPartitionsQueryOptions(
     client,
     request,
@@ -1027,13 +1115,19 @@ export function getRuntimeServiceListConnectorDriversQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceListConnectorDriversQueryOptions(
+export function getRuntimeServiceListConnectorDriversQueryOptions<
+  TData = V1ListConnectorDriversResponse,
+>(
   client: RuntimeClient,
   request: PartialMessage<ListConnectorDriversRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListConnectorDriversResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListConnectorDriversResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ListConnectorDriversResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListConnectorDriversResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListConnectorDriversQueryKey(
     client.instanceId,
     request,
@@ -1045,17 +1139,23 @@ export function getRuntimeServiceListConnectorDriversQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListConnectorDriversResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListConnectorDrivers(
+export function createRuntimeServiceListConnectorDrivers<
+  TData = V1ListConnectorDriversResponse,
+>(
   client: RuntimeClient,
   request: PartialMessage<ListConnectorDriversRequest>,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListConnectorDriversResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListConnectorDriversResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListConnectorDriversResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListConnectorDriversQueryOptions(
     client,
     request,
@@ -1095,13 +1195,19 @@ export function getRuntimeServiceAnalyzeConnectorsQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceAnalyzeConnectorsQueryOptions(
+export function getRuntimeServiceAnalyzeConnectorsQueryOptions<
+  TData = V1AnalyzeConnectorsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1AnalyzeConnectorsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1AnalyzeConnectorsResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1AnalyzeConnectorsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1AnalyzeConnectorsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceAnalyzeConnectorsQueryKey(
     client.instanceId,
     request,
@@ -1113,17 +1219,23 @@ export function getRuntimeServiceAnalyzeConnectorsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1AnalyzeConnectorsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceAnalyzeConnectors(
+export function createRuntimeServiceAnalyzeConnectors<
+  TData = V1AnalyzeConnectorsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeConnectorsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1AnalyzeConnectorsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1AnalyzeConnectorsResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1AnalyzeConnectorsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceAnalyzeConnectorsQueryOptions(
     client,
     request,
@@ -1163,13 +1275,17 @@ export function getRuntimeServiceListNotifierConnectorsQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceListNotifierConnectorsQueryOptions(
+export function getRuntimeServiceListNotifierConnectorsQueryOptions<
+  TData = V1ListNotifierConnectorsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListNotifierConnectorsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListNotifierConnectorsResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ListNotifierConnectorsResponse> & {
+): CreateQueryOptions<V1ListNotifierConnectorsResponse, Error, TData> & {
   queryKey: QueryKey;
 } {
   const queryKey = getRuntimeServiceListNotifierConnectorsQueryKey(
@@ -1184,17 +1300,23 @@ export function getRuntimeServiceListNotifierConnectorsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListNotifierConnectorsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListNotifierConnectors(
+export function createRuntimeServiceListNotifierConnectors<
+  TData = V1ListNotifierConnectorsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListNotifierConnectorsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListNotifierConnectorsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListNotifierConnectorsResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListNotifierConnectorsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListNotifierConnectorsQueryOptions(
     client,
     request,
@@ -1234,13 +1356,19 @@ export function getRuntimeServiceListConversationsQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceListConversationsQueryOptions(
+export function getRuntimeServiceListConversationsQueryOptions<
+  TData = V1ListConversationsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListConversationsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListConversationsResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ListConversationsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListConversationsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListConversationsQueryKey(
     client.instanceId,
     request,
@@ -1252,17 +1380,23 @@ export function getRuntimeServiceListConversationsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListConversationsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListConversations(
+export function createRuntimeServiceListConversations<
+  TData = V1ListConversationsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListConversationsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListConversationsResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListConversationsResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListConversationsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListConversationsQueryOptions(
     client,
     request,
@@ -1302,13 +1436,19 @@ export function getRuntimeServiceGetConversationQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceGetConversationQueryOptions(
+export function getRuntimeServiceGetConversationQueryOptions<
+  TData = V1GetConversationResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetConversationResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1GetConversationResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1GetConversationResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1GetConversationResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceGetConversationQueryKey(
     client.instanceId,
     request,
@@ -1320,17 +1460,23 @@ export function getRuntimeServiceGetConversationQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1GetConversationResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceGetConversation(
+export function createRuntimeServiceGetConversation<
+  TData = V1GetConversationResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<GetConversationRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1GetConversationResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1GetConversationResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1GetConversationResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceGetConversationQueryOptions(
     client,
     request,
@@ -1365,13 +1511,17 @@ export function getRuntimeServiceListToolsQueryKey(
   return ["RuntimeService", "listTools", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceListToolsQueryOptions(
+export function getRuntimeServiceListToolsQueryOptions<
+  TData = V1ListToolsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListToolsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListToolsResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListToolsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListToolsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListToolsQueryKey(
     client.instanceId,
     request,
@@ -1383,17 +1533,19 @@ export function getRuntimeServiceListToolsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListToolsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListTools(
+export function createRuntimeServiceListTools<TData = V1ListToolsResponse>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListToolsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListToolsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListToolsResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListToolsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListToolsQueryOptions(
     client,
     request,
@@ -1424,13 +1576,17 @@ export function getRuntimeServiceIssueDevJWTQueryKey(
   return ["RuntimeService", "issueDevJWT", instanceId, request ?? {}] as const;
 }
 
-export function getRuntimeServiceIssueDevJWTQueryOptions(
+export function getRuntimeServiceIssueDevJWTQueryOptions<
+  TData = V1IssueDevJWTResponse,
+>(
   client: RuntimeClient,
   request: V1IssueDevJWTRequest,
   options?: {
-    query?: Partial<CreateQueryOptions<V1IssueDevJWTResponse>>;
+    query?: Partial<CreateQueryOptions<V1IssueDevJWTResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1IssueDevJWTResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1IssueDevJWTResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceIssueDevJWTQueryKey(
     client.instanceId,
     request,
@@ -1442,17 +1598,19 @@ export function getRuntimeServiceIssueDevJWTQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1IssueDevJWTResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceIssueDevJWT(
+export function createRuntimeServiceIssueDevJWT<TData = V1IssueDevJWTResponse>(
   client: RuntimeClient,
   request: V1IssueDevJWTRequest,
   options?: {
-    query?: Partial<CreateQueryOptions<V1IssueDevJWTResponse>>;
+    query?: Partial<CreateQueryOptions<V1IssueDevJWTResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1IssueDevJWTResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceIssueDevJWTQueryOptions(
     client,
     request,
@@ -1492,13 +1650,19 @@ export function getRuntimeServiceAnalyzeVariablesQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceAnalyzeVariablesQueryOptions(
+export function getRuntimeServiceAnalyzeVariablesQueryOptions<
+  TData = V1AnalyzeVariablesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1AnalyzeVariablesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1AnalyzeVariablesResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1AnalyzeVariablesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1AnalyzeVariablesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceAnalyzeVariablesQueryKey(
     client.instanceId,
     request,
@@ -1510,17 +1674,23 @@ export function getRuntimeServiceAnalyzeVariablesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1AnalyzeVariablesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceAnalyzeVariables(
+export function createRuntimeServiceAnalyzeVariables<
+  TData = V1AnalyzeVariablesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<AnalyzeVariablesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1AnalyzeVariablesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1AnalyzeVariablesResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1AnalyzeVariablesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceAnalyzeVariablesQueryOptions(
     client,
     request,
@@ -1560,13 +1730,17 @@ export function getRuntimeServiceListGitCommitsQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceListGitCommitsQueryOptions(
+export function getRuntimeServiceListGitCommitsQueryOptions<
+  TData = V1ListGitCommitsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListGitCommitsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListGitCommitsResponse, Error, TData>>;
   },
-): CreateQueryOptions<V1ListGitCommitsResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListGitCommitsResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListGitCommitsQueryKey(
     client.instanceId,
     request,
@@ -1578,17 +1752,21 @@ export function getRuntimeServiceListGitCommitsQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListGitCommitsResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListGitCommits(
+export function createRuntimeServiceListGitCommits<
+  TData = V1ListGitCommitsResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitCommitsRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListGitCommitsResponse>>;
+    query?: Partial<CreateQueryOptions<V1ListGitCommitsResponse, Error, TData>>;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListGitCommitsResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListGitCommitsQueryOptions(
     client,
     request,
@@ -1628,13 +1806,19 @@ export function getRuntimeServiceListGitBranchesQueryKey(
   ] as const;
 }
 
-export function getRuntimeServiceListGitBranchesQueryOptions(
+export function getRuntimeServiceListGitBranchesQueryOptions<
+  TData = V1ListGitBranchesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListGitBranchesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListGitBranchesResponse, Error, TData>
+    >;
   },
-): CreateQueryOptions<V1ListGitBranchesResponse> & { queryKey: QueryKey } {
+): CreateQueryOptions<V1ListGitBranchesResponse, Error, TData> & {
+  queryKey: QueryKey;
+} {
   const queryKey = getRuntimeServiceListGitBranchesQueryKey(
     client.instanceId,
     request,
@@ -1646,17 +1830,23 @@ export function getRuntimeServiceListGitBranchesQueryOptions(
     queryFn,
     enabled: !!client.instanceId,
     ...options?.query,
+  } as CreateQueryOptions<V1ListGitBranchesResponse, Error, TData> & {
+    queryKey: QueryKey;
   };
 }
 
-export function createRuntimeServiceListGitBranches(
+export function createRuntimeServiceListGitBranches<
+  TData = V1ListGitBranchesResponse,
+>(
   client: RuntimeClient,
   request: Omit<PartialMessage<ListGitBranchesRequest>, "instanceId">,
   options?: {
-    query?: Partial<CreateQueryOptions<V1ListGitBranchesResponse>>;
+    query?: Partial<
+      CreateQueryOptions<V1ListGitBranchesResponse, Error, TData>
+    >;
   },
   queryClient?: QueryClient,
-): CreateQueryResult<V1ListGitBranchesResponse> {
+): CreateQueryResult<TData, Error> {
   const queryOptions = getRuntimeServiceListGitBranchesQueryOptions(
     client,
     request,

From a77cf00a038e2c1932cf6b5c419f5b8b694c568b Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 15:11:10 +0300
Subject: [PATCH 08/27] fix: strip undefined values before proto fromJson in
 JSON bridge

Proto fromJson() rejects undefined field values, but callers may pass
them (e.g., TanStack Query's pageParam starts as undefined, or reactive
props that resolve asynchronously). Orval's HTTP client silently omitted
undefined values; the JSON bridge must do the same.
---
 web-common/scripts/generate-query-hooks.ts    |  15 +-
 .../v2/gen/connector-service.ts               |  78 +--
 .../runtime-client/v2/gen/query-service.ts    | 318 +++++++-----
 .../runtime-client/v2/gen/runtime-service.ts  | 473 +++++++++++-------
 4 files changed, 546 insertions(+), 338 deletions(-)

diff --git a/web-common/scripts/generate-query-hooks.ts b/web-common/scripts/generate-query-hooks.ts
index ebf1635be73..186974e314f 100644
--- a/web-common/scripts/generate-query-hooks.ts
+++ b/web-common/scripts/generate-query-hooks.ts
@@ -237,6 +237,17 @@ function generateServiceFile(service: ServiceDef): string {
     `} from "${protoImportPath}";`,
   );
 
+  // Utility: strip undefined values before passing to proto fromJson
+  // (proto fromJson rejects undefined; Orval's HTTP client silently omitted them)
+  lines.push(
+    ``,
+    `/** Strip undefined values — proto fromJson rejects them */`,
+    `// eslint-disable-next-line @typescript-eslint/no-explicit-any`,
+    `function stripUndefined(obj: Record<string, any>): Record<string, unknown> {`,
+    `  return Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== undefined));`,
+    `}`,
+  );
+
   lines.push(``);
 
   // --- Query methods ---
@@ -269,7 +280,7 @@ function generateServiceFile(service: ServiceDef): string {
       `  options?: { signal?: AbortSignal },`,
       `): Promise<${responseType}> {`,
       `  return client.${serviceClientProp}.${m.methodKey}(`,
-      `    ${m.inputType}.fromJson(${requestSpread} as unknown as JsonValue),`,
+      `    ${m.inputType}.fromJson(stripUndefined(${requestSpread}) as unknown as JsonValue),`,
       `    { signal: options?.signal },`,
       `  ).then(r => r.toJson() as unknown as ${responseType});`,
       `}`,
@@ -354,7 +365,7 @@ function generateServiceFile(service: ServiceDef): string {
       `  request: ${requestType},`,
       `): Promise<${responseType}> {`,
       `  return client.${serviceClientProp}.${m.methodKey}(`,
-      `    ${m.inputType}.fromJson(${requestSpread} as unknown as JsonValue),`,
+      `    ${m.inputType}.fromJson(stripUndefined(${requestSpread}) as unknown as JsonValue),`,
       `  ).then(r => r.toJson() as unknown as ${responseType});`,
       `}`,
       ``,
diff --git a/web-common/src/runtime-client/v2/gen/connector-service.ts b/web-common/src/runtime-client/v2/gen/connector-service.ts
index 648aa855528..a240b5cc2e3 100644
--- a/web-common/src/runtime-client/v2/gen/connector-service.ts
+++ b/web-common/src/runtime-client/v2/gen/connector-service.ts
@@ -32,6 +32,14 @@ import {
   OLAPListTablesRequest,
 } from "../../../proto/gen/rill/runtime/v1/connectors_pb";
 
+/** Strip undefined values — proto fromJson rejects them */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function stripUndefined(obj: Record<string, any>): Record<string, unknown> {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([, v]) => v !== undefined),
+  );
+}
+
 /**
  * Raw RPC call: ConnectorService.ListBuckets
  */
@@ -42,10 +50,12 @@ export function connectorServiceListBuckets(
 ): Promise<V1ListBucketsResponse> {
   return client.connectorService
     .listBuckets(
-      ListBucketsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListBucketsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListBucketsResponse);
@@ -118,10 +128,12 @@ export function connectorServiceListObjects(
 ): Promise<V1ListObjectsResponse> {
   return client.connectorService
     .listObjects(
-      ListObjectsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListObjectsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListObjectsResponse);
@@ -194,10 +206,12 @@ export function connectorServiceOLAPListTables(
 ): Promise<V1OLAPListTablesResponse> {
   return client.connectorService
     .oLAPListTables(
-      OLAPListTablesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      OLAPListTablesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1OLAPListTablesResponse);
@@ -270,10 +284,12 @@ export function connectorServiceOLAPGetTable(
 ): Promise<V1OLAPGetTableResponse> {
   return client.connectorService
     .oLAPGetTable(
-      OLAPGetTableRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      OLAPGetTableRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1OLAPGetTableResponse);
@@ -346,10 +362,12 @@ export function connectorServiceListDatabaseSchemas(
 ): Promise<V1ListDatabaseSchemasResponse> {
   return client.connectorService
     .listDatabaseSchemas(
-      ListDatabaseSchemasRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListDatabaseSchemasRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListDatabaseSchemasResponse);
@@ -426,10 +444,12 @@ export function connectorServiceListTables(
 ): Promise<V1ListTablesResponse> {
   return client.connectorService
     .listTables(
-      ListTablesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListTablesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListTablesResponse);
@@ -495,10 +515,12 @@ export function connectorServiceGetTable(
 ): Promise<V1GetTableResponse> {
   return client.connectorService
     .getTable(
-      GetTableRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GetTableRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1GetTableResponse);
diff --git a/web-common/src/runtime-client/v2/gen/query-service.ts b/web-common/src/runtime-client/v2/gen/query-service.ts
index 379f3b1cdfa..e4961c21dc4 100644
--- a/web-common/src/runtime-client/v2/gen/query-service.ts
+++ b/web-common/src/runtime-client/v2/gen/query-service.ts
@@ -99,6 +99,14 @@ import {
   TableRowsRequest,
 } from "../../../proto/gen/rill/runtime/v1/queries_pb";
 
+/** Strip undefined values — proto fromJson rejects them */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function stripUndefined(obj: Record<string, any>): Record<string, unknown> {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([, v]) => v !== undefined),
+  );
+}
+
 /**
  * Raw RPC call: QueryService.MetricsViewAggregation
  */
@@ -109,10 +117,12 @@ export function queryServiceMetricsViewAggregation(
 ): Promise<V1MetricsViewAggregationResponse> {
   return client.queryService
     .metricsViewAggregation(
-      MetricsViewAggregationRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewAggregationRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewAggregationResponse);
@@ -190,10 +200,12 @@ export function queryServiceMetricsViewToplist(
 ): Promise<V1MetricsViewToplistResponse> {
   return client.queryService
     .metricsViewToplist(
-      MetricsViewToplistRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewToplistRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewToplistResponse);
@@ -270,10 +282,12 @@ export function queryServiceMetricsViewComparison(
 ): Promise<V1MetricsViewComparisonResponse> {
   return client.queryService
     .metricsViewComparison(
-      MetricsViewComparisonRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewComparisonRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewComparisonResponse);
@@ -351,10 +365,12 @@ export function queryServiceMetricsViewTimeSeries(
 ): Promise<V1MetricsViewTimeSeriesResponse> {
   return client.queryService
     .metricsViewTimeSeries(
-      MetricsViewTimeSeriesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewTimeSeriesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewTimeSeriesResponse);
@@ -432,10 +448,12 @@ export function queryServiceMetricsViewTotals(
 ): Promise<V1MetricsViewTotalsResponse> {
   return client.queryService
     .metricsViewTotals(
-      MetricsViewTotalsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewTotalsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewTotalsResponse);
@@ -512,10 +530,12 @@ export function queryServiceMetricsViewRows(
 ): Promise<V1MetricsViewRowsResponse> {
   return client.queryService
     .metricsViewRows(
-      MetricsViewRowsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewRowsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewRowsResponse);
@@ -592,10 +612,12 @@ export function queryServiceMetricsViewTimeRange(
 ): Promise<V1MetricsViewTimeRangeResponse> {
   return client.queryService
     .metricsViewTimeRange(
-      MetricsViewTimeRangeRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewTimeRangeRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewTimeRangeResponse);
@@ -672,10 +694,12 @@ export function queryServiceMetricsViewSchema(
 ): Promise<V1MetricsViewSchemaResponse> {
   return client.queryService
     .metricsViewSchema(
-      MetricsViewSchemaRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewSchemaRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewSchemaResponse);
@@ -752,10 +776,12 @@ export function queryServiceMetricsViewSearch(
 ): Promise<V1MetricsViewSearchResponse> {
   return client.queryService
     .metricsViewSearch(
-      MetricsViewSearchRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewSearchRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewSearchResponse);
@@ -832,10 +858,12 @@ export function queryServiceMetricsViewTimeRanges(
 ): Promise<V1MetricsViewTimeRangesResponse> {
   return client.queryService
     .metricsViewTimeRanges(
-      MetricsViewTimeRangesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewTimeRangesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewTimeRangesResponse);
@@ -913,10 +941,12 @@ export function queryServiceMetricsViewAnnotations(
 ): Promise<V1MetricsViewAnnotationsResponse> {
   return client.queryService
     .metricsViewAnnotations(
-      MetricsViewAnnotationsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      MetricsViewAnnotationsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1MetricsViewAnnotationsResponse);
@@ -997,10 +1027,12 @@ export function queryServiceConvertExpressionToMetricsSQL(
 ): Promise<V1ConvertExpressionToMetricsSQLResponse> {
   return client.queryService
     .convertExpressionToMetricsSQL(
-      ConvertExpressionToMetricsSQLRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ConvertExpressionToMetricsSQLRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then(
@@ -1091,10 +1123,12 @@ export function queryServiceResolveCanvas(
 ): Promise<V1ResolveCanvasResponse> {
   return client.queryService
     .resolveCanvas(
-      ResolveCanvasRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ResolveCanvasRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ResolveCanvasResponse);
@@ -1162,10 +1196,12 @@ export function queryServiceResolveComponent(
 ): Promise<V1ResolveComponentResponse> {
   return client.queryService
     .resolveComponent(
-      ResolveComponentRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ResolveComponentRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ResolveComponentResponse);
@@ -1242,10 +1278,12 @@ export function queryServiceResolveTemplatedString(
 ): Promise<V1ResolveTemplatedStringResponse> {
   return client.queryService
     .resolveTemplatedString(
-      ResolveTemplatedStringRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ResolveTemplatedStringRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ResolveTemplatedStringResponse);
@@ -1323,10 +1361,12 @@ export function queryServiceColumnRollupInterval(
 ): Promise<V1ColumnRollupIntervalResponse> {
   return client.queryService
     .columnRollupInterval(
-      ColumnRollupIntervalRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnRollupIntervalRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnRollupIntervalResponse);
@@ -1403,10 +1443,12 @@ export function queryServiceColumnTopK(
 ): Promise<V1ColumnTopKResponse> {
   return client.queryService
     .columnTopK(
-      ColumnTopKRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnTopKRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnTopKResponse);
@@ -1472,10 +1514,12 @@ export function queryServiceColumnNullCount(
 ): Promise<V1ColumnNullCountResponse> {
   return client.queryService
     .columnNullCount(
-      ColumnNullCountRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnNullCountRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnNullCountResponse);
@@ -1552,10 +1596,12 @@ export function queryServiceColumnDescriptiveStatistics(
 ): Promise<V1ColumnDescriptiveStatisticsResponse> {
   return client.queryService
     .columnDescriptiveStatistics(
-      ColumnDescriptiveStatisticsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnDescriptiveStatisticsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then(
@@ -1637,10 +1683,12 @@ export function queryServiceColumnTimeGrain(
 ): Promise<V1ColumnTimeGrainResponse> {
   return client.queryService
     .columnTimeGrain(
-      ColumnTimeGrainRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnTimeGrainRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnTimeGrainResponse);
@@ -1717,10 +1765,12 @@ export function queryServiceColumnNumericHistogram(
 ): Promise<V1ColumnNumericHistogramResponse> {
   return client.queryService
     .columnNumericHistogram(
-      ColumnNumericHistogramRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnNumericHistogramRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnNumericHistogramResponse);
@@ -1798,10 +1848,12 @@ export function queryServiceColumnRugHistogram(
 ): Promise<V1ColumnRugHistogramResponse> {
   return client.queryService
     .columnRugHistogram(
-      ColumnRugHistogramRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnRugHistogramRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnRugHistogramResponse);
@@ -1878,10 +1930,12 @@ export function queryServiceColumnTimeRange(
 ): Promise<V1ColumnTimeRangeResponse> {
   return client.queryService
     .columnTimeRange(
-      ColumnTimeRangeRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnTimeRangeRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnTimeRangeResponse);
@@ -1958,10 +2012,12 @@ export function queryServiceColumnCardinality(
 ): Promise<V1ColumnCardinalityResponse> {
   return client.queryService
     .columnCardinality(
-      ColumnCardinalityRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnCardinalityRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnCardinalityResponse);
@@ -2038,10 +2094,12 @@ export function queryServiceColumnTimeSeries(
 ): Promise<V1ColumnTimeSeriesResponse> {
   return client.queryService
     .columnTimeSeries(
-      ColumnTimeSeriesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ColumnTimeSeriesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ColumnTimeSeriesResponse);
@@ -2118,10 +2176,12 @@ export function queryServiceTableCardinality(
 ): Promise<V1TableCardinalityResponse> {
   return client.queryService
     .tableCardinality(
-      TableCardinalityRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      TableCardinalityRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1TableCardinalityResponse);
@@ -2198,10 +2258,12 @@ export function queryServiceTableColumns(
 ): Promise<V1TableColumnsResponse> {
   return client.queryService
     .tableColumns(
-      TableColumnsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      TableColumnsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1TableColumnsResponse);
@@ -2267,10 +2329,12 @@ export function queryServiceTableRows(
 ): Promise<V1TableRowsResponse> {
   return client.queryService
     .tableRows(
-      TableRowsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      TableRowsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1TableRowsResponse);
@@ -2332,10 +2396,12 @@ export function queryServiceQuery(
 ): Promise<V1QueryResponse> {
   return client.queryService
     .query(
-      QueryRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      QueryRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1QueryResponse);
 }
@@ -2388,10 +2454,12 @@ export function queryServiceExport(
 ): Promise<V1ExportResponse> {
   return client.queryService
     .export(
-      ExportRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ExportRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1ExportResponse);
 }
@@ -2444,10 +2512,12 @@ export function queryServiceExportReport(
 ): Promise<V1ExportReportResponse> {
   return client.queryService
     .exportReport(
-      ExportReportRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ExportReportRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1ExportReportResponse);
 }
diff --git a/web-common/src/runtime-client/v2/gen/runtime-service.ts b/web-common/src/runtime-client/v2/gen/runtime-service.ts
index 80c398ce894..7f4e61f6d3b 100644
--- a/web-common/src/runtime-client/v2/gen/runtime-service.ts
+++ b/web-common/src/runtime-client/v2/gen/runtime-service.ts
@@ -118,6 +118,14 @@ import {
   UnpackExampleRequest,
 } from "../../../proto/gen/rill/runtime/v1/api_pb";
 
+/** Strip undefined values — proto fromJson rejects them */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function stripUndefined(obj: Record<string, any>): Record<string, unknown> {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([, v]) => v !== undefined),
+  );
+}
+
 /**
  * Raw RPC call: RuntimeService.Ping
  */
@@ -127,9 +135,10 @@ export function runtimeServicePing(
   options?: { signal?: AbortSignal },
 ): Promise<V1PingResponse> {
   return client.runtimeService
-    .ping(PingRequest.fromJson(request as unknown as JsonValue), {
-      signal: options?.signal,
-    })
+    .ping(
+      PingRequest.fromJson(stripUndefined(request) as unknown as JsonValue),
+      { signal: options?.signal },
+    )
     .then((r) => r.toJson() as unknown as V1PingResponse);
 }
 
@@ -185,9 +194,10 @@ export function runtimeServiceHealth(
   options?: { signal?: AbortSignal },
 ): Promise<V1HealthResponse> {
   return client.runtimeService
-    .health(HealthRequest.fromJson(request as unknown as JsonValue), {
-      signal: options?.signal,
-    })
+    .health(
+      HealthRequest.fromJson(stripUndefined(request) as unknown as JsonValue),
+      { signal: options?.signal },
+    )
     .then((r) => r.toJson() as unknown as V1HealthResponse);
 }
 
@@ -244,10 +254,12 @@ export function runtimeServiceInstanceHealth(
 ): Promise<V1InstanceHealthResponse> {
   return client.runtimeService
     .instanceHealth(
-      InstanceHealthRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      InstanceHealthRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1InstanceHealthResponse);
@@ -320,7 +332,9 @@ export function runtimeServiceListInstances(
 ): Promise<V1ListInstancesResponse> {
   return client.runtimeService
     .listInstances(
-      ListInstancesRequest.fromJson(request as unknown as JsonValue),
+      ListInstancesRequest.fromJson(
+        stripUndefined(request) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListInstancesResponse);
@@ -393,10 +407,12 @@ export function runtimeServiceGetInstance(
 ): Promise<V1GetInstanceResponse> {
   return client.runtimeService
     .getInstance(
-      GetInstanceRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GetInstanceRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1GetInstanceResponse);
@@ -462,10 +478,12 @@ export function runtimeServiceListFiles(
 ): Promise<V1ListFilesResponse> {
   return client.runtimeService
     .listFiles(
-      ListFilesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListFilesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListFilesResponse);
@@ -531,10 +549,12 @@ export function runtimeServiceGetFile(
 ): Promise<V1GetFileResponse> {
   return client.runtimeService
     .getFile(
-      GetFileRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GetFileRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1GetFileResponse);
@@ -595,7 +615,9 @@ export function runtimeServiceListExamples(
 ): Promise<V1ListExamplesResponse> {
   return client.runtimeService
     .listExamples(
-      ListExamplesRequest.fromJson(request as unknown as JsonValue),
+      ListExamplesRequest.fromJson(
+        stripUndefined(request) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListExamplesResponse);
@@ -663,10 +685,12 @@ export function runtimeServiceQueryResolver(
 ): Promise<V1QueryResolverResponse> {
   return client.runtimeService
     .queryResolver(
-      QueryResolverRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      QueryResolverRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1QueryResolverResponse);
@@ -739,10 +763,12 @@ export function runtimeServiceGetLogs(
 ): Promise<V1GetLogsResponse> {
   return client.runtimeService
     .getLogs(
-      GetLogsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GetLogsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1GetLogsResponse);
@@ -803,10 +829,12 @@ export function runtimeServiceListResources(
 ): Promise<V1ListResourcesResponse> {
   return client.runtimeService
     .listResources(
-      ListResourcesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListResourcesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListResourcesResponse);
@@ -879,10 +907,12 @@ export function runtimeServiceGetResource(
 ): Promise<V1GetResourceResponse> {
   return client.runtimeService
     .getResource(
-      GetResourceRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GetResourceRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1GetResourceResponse);
@@ -948,10 +978,12 @@ export function runtimeServiceGetExplore(
 ): Promise<V1GetExploreResponse> {
   return client.runtimeService
     .getExplore(
-      GetExploreRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GetExploreRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1GetExploreResponse);
@@ -1017,10 +1049,12 @@ export function runtimeServiceGetModelPartitions(
 ): Promise<V1GetModelPartitionsResponse> {
   return client.runtimeService
     .getModelPartitions(
-      GetModelPartitionsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GetModelPartitionsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1GetModelPartitionsResponse);
@@ -1097,7 +1131,9 @@ export function runtimeServiceListConnectorDrivers(
 ): Promise<V1ListConnectorDriversResponse> {
   return client.runtimeService
     .listConnectorDrivers(
-      ListConnectorDriversRequest.fromJson(request as unknown as JsonValue),
+      ListConnectorDriversRequest.fromJson(
+        stripUndefined(request) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListConnectorDriversResponse);
@@ -1174,10 +1210,12 @@ export function runtimeServiceAnalyzeConnectors(
 ): Promise<V1AnalyzeConnectorsResponse> {
   return client.runtimeService
     .analyzeConnectors(
-      AnalyzeConnectorsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      AnalyzeConnectorsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1AnalyzeConnectorsResponse);
@@ -1254,10 +1292,12 @@ export function runtimeServiceListNotifierConnectors(
 ): Promise<V1ListNotifierConnectorsResponse> {
   return client.runtimeService
     .listNotifierConnectors(
-      ListNotifierConnectorsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListNotifierConnectorsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListNotifierConnectorsResponse);
@@ -1335,10 +1375,12 @@ export function runtimeServiceListConversations(
 ): Promise<V1ListConversationsResponse> {
   return client.runtimeService
     .listConversations(
-      ListConversationsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListConversationsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListConversationsResponse);
@@ -1415,10 +1457,12 @@ export function runtimeServiceGetConversation(
 ): Promise<V1GetConversationResponse> {
   return client.runtimeService
     .getConversation(
-      GetConversationRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GetConversationRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1GetConversationResponse);
@@ -1495,10 +1539,12 @@ export function runtimeServiceListTools(
 ): Promise<V1ListToolsResponse> {
   return client.runtimeService
     .listTools(
-      ListToolsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListToolsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListToolsResponse);
@@ -1563,9 +1609,12 @@ export function runtimeServiceIssueDevJWT(
   options?: { signal?: AbortSignal },
 ): Promise<V1IssueDevJWTResponse> {
   return client.runtimeService
-    .issueDevJWT(IssueDevJWTRequest.fromJson(request as unknown as JsonValue), {
-      signal: options?.signal,
-    })
+    .issueDevJWT(
+      IssueDevJWTRequest.fromJson(
+        stripUndefined(request) as unknown as JsonValue,
+      ),
+      { signal: options?.signal },
+    )
     .then((r) => r.toJson() as unknown as V1IssueDevJWTResponse);
 }
 
@@ -1629,10 +1678,12 @@ export function runtimeServiceAnalyzeVariables(
 ): Promise<V1AnalyzeVariablesResponse> {
   return client.runtimeService
     .analyzeVariables(
-      AnalyzeVariablesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      AnalyzeVariablesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1AnalyzeVariablesResponse);
@@ -1709,10 +1760,12 @@ export function runtimeServiceListGitCommits(
 ): Promise<V1ListGitCommitsResponse> {
   return client.runtimeService
     .listGitCommits(
-      ListGitCommitsRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListGitCommitsRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListGitCommitsResponse);
@@ -1785,10 +1838,12 @@ export function runtimeServiceListGitBranches(
 ): Promise<V1ListGitBranchesResponse> {
   return client.runtimeService
     .listGitBranches(
-      ListGitBranchesRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ListGitBranchesRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
       { signal: options?.signal },
     )
     .then((r) => r.toJson() as unknown as V1ListGitBranchesResponse);
@@ -1864,10 +1919,12 @@ export function runtimeServiceCreateInstance(
 ): Promise<V1CreateInstanceResponse> {
   return client.runtimeService
     .createInstance(
-      CreateInstanceRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      CreateInstanceRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1CreateInstanceResponse);
 }
@@ -1923,10 +1980,12 @@ export function runtimeServiceEditInstance(
 ): Promise<V1EditInstanceResponse> {
   return client.runtimeService
     .editInstance(
-      EditInstanceRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      EditInstanceRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1EditInstanceResponse);
 }
@@ -1982,10 +2041,12 @@ export function runtimeServiceDeleteInstance(
 ): Promise<V1DeleteInstanceResponse> {
   return client.runtimeService
     .deleteInstance(
-      DeleteInstanceRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      DeleteInstanceRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1DeleteInstanceResponse);
 }
@@ -2041,10 +2102,12 @@ export function runtimeServiceReloadConfig(
 ): Promise<V1ReloadConfigResponse> {
   return client.runtimeService
     .reloadConfig(
-      ReloadConfigRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ReloadConfigRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1ReloadConfigResponse);
 }
@@ -2100,10 +2163,12 @@ export function runtimeServicePutFile(
 ): Promise<V1PutFileResponse> {
   return client.runtimeService
     .putFile(
-      PutFileRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      PutFileRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1PutFileResponse);
 }
@@ -2159,10 +2224,12 @@ export function runtimeServiceCreateDirectory(
 ): Promise<V1CreateDirectoryResponse> {
   return client.runtimeService
     .createDirectory(
-      CreateDirectoryRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      CreateDirectoryRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1CreateDirectoryResponse);
 }
@@ -2218,10 +2285,12 @@ export function runtimeServiceDeleteFile(
 ): Promise<V1DeleteFileResponse> {
   return client.runtimeService
     .deleteFile(
-      DeleteFileRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      DeleteFileRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1DeleteFileResponse);
 }
@@ -2277,10 +2346,12 @@ export function runtimeServiceRenameFile(
 ): Promise<V1RenameFileResponse> {
   return client.runtimeService
     .renameFile(
-      RenameFileRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      RenameFileRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1RenameFileResponse);
 }
@@ -2336,10 +2407,12 @@ export function runtimeServiceUnpackExample(
 ): Promise<V1UnpackExampleResponse> {
   return client.runtimeService
     .unpackExample(
-      UnpackExampleRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      UnpackExampleRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1UnpackExampleResponse);
 }
@@ -2395,10 +2468,12 @@ export function runtimeServiceUnpackEmpty(
 ): Promise<V1UnpackEmptyResponse> {
   return client.runtimeService
     .unpackEmpty(
-      UnpackEmptyRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      UnpackEmptyRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1UnpackEmptyResponse);
 }
@@ -2454,10 +2529,12 @@ export function runtimeServiceGenerateMetricsViewFile(
 ): Promise<V1GenerateMetricsViewFileResponse> {
   return client.runtimeService
     .generateMetricsViewFile(
-      GenerateMetricsViewFileRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GenerateMetricsViewFileRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GenerateMetricsViewFileResponse);
 }
@@ -2512,10 +2589,12 @@ export function runtimeServiceGenerateCanvasFile(
 ): Promise<V1GenerateCanvasFileResponse> {
   return client.runtimeService
     .generateCanvasFile(
-      GenerateCanvasFileRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GenerateCanvasFileRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GenerateCanvasFileResponse);
 }
@@ -2571,10 +2650,12 @@ export function runtimeServiceGenerateResolver(
 ): Promise<V1GenerateResolverResponse> {
   return client.runtimeService
     .generateResolver(
-      GenerateResolverRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GenerateResolverRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GenerateResolverResponse);
 }
@@ -2630,10 +2711,12 @@ export function runtimeServiceGenerateRenderer(
 ): Promise<V1GenerateRendererResponse> {
   return client.runtimeService
     .generateRenderer(
-      GenerateRendererRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GenerateRendererRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GenerateRendererResponse);
 }
@@ -2689,10 +2772,12 @@ export function runtimeServiceCreateTrigger(
 ): Promise<V1CreateTriggerResponse> {
   return client.runtimeService
     .createTrigger(
-      CreateTriggerRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      CreateTriggerRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1CreateTriggerResponse);
 }
@@ -2748,10 +2833,12 @@ export function runtimeServiceShareConversation(
 ): Promise<V1ShareConversationResponse> {
   return client.runtimeService
     .shareConversation(
-      ShareConversationRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ShareConversationRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1ShareConversationResponse);
 }
@@ -2807,10 +2894,12 @@ export function runtimeServiceForkConversation(
 ): Promise<V1ForkConversationResponse> {
   return client.runtimeService
     .forkConversation(
-      ForkConversationRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      ForkConversationRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1ForkConversationResponse);
 }
@@ -2866,10 +2955,12 @@ export function runtimeServiceComplete(
 ): Promise<V1CompleteResponse> {
   return client.runtimeService
     .complete(
-      CompleteRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      CompleteRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1CompleteResponse);
 }
@@ -2925,10 +3016,12 @@ export function runtimeServiceGitStatus(
 ): Promise<V1GitStatusResponse> {
   return client.runtimeService
     .gitStatus(
-      GitStatusRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GitStatusRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GitStatusResponse);
 }
@@ -2984,10 +3077,12 @@ export function runtimeServiceGitCommit(
 ): Promise<V1GitCommitResponse> {
   return client.runtimeService
     .gitCommit(
-      GitCommitRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GitCommitRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GitCommitResponse);
 }
@@ -3043,10 +3138,12 @@ export function runtimeServiceRestoreGitCommit(
 ): Promise<V1RestoreGitCommitResponse> {
   return client.runtimeService
     .restoreGitCommit(
-      RestoreGitCommitRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      RestoreGitCommitRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1RestoreGitCommitResponse);
 }
@@ -3102,10 +3199,12 @@ export function runtimeServiceGitMergeToBranch(
 ): Promise<V1GitMergeToBranchResponse> {
   return client.runtimeService
     .gitMergeToBranch(
-      GitMergeToBranchRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GitMergeToBranchRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GitMergeToBranchResponse);
 }
@@ -3161,10 +3260,12 @@ export function runtimeServiceGitSwitchBranch(
 ): Promise<V1GitSwitchBranchResponse> {
   return client.runtimeService
     .gitSwitchBranch(
-      GitSwitchBranchRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GitSwitchBranchRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GitSwitchBranchResponse);
 }
@@ -3220,10 +3321,12 @@ export function runtimeServiceGitPull(
 ): Promise<V1GitPullResponse> {
   return client.runtimeService
     .gitPull(
-      GitPullRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GitPullRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GitPullResponse);
 }
@@ -3279,10 +3382,12 @@ export function runtimeServiceGitPush(
 ): Promise<V1GitPushResponse> {
   return client.runtimeService
     .gitPush(
-      GitPushRequest.fromJson({
-        instanceId: client.instanceId,
-        ...request,
-      } as unknown as JsonValue),
+      GitPushRequest.fromJson(
+        stripUndefined({
+          instanceId: client.instanceId,
+          ...request,
+        }) as unknown as JsonValue,
+      ),
     )
     .then((r) => r.toJson() as unknown as V1GitPushResponse);
 }

From 369e0b54dcfe044f45b067a1a2a86ecc28d254b6 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 15:31:10 +0300
Subject: [PATCH 09/27] fix: emit default values in proto toJson to match
 gRPC-Gateway output

Proto3 toJson() omits fields with default values (0, "", false) by
default. gRPC-Gateway includes them. This caused missing fields like
low: 0 in histogram bins, breaking D3 scale computations and rendering
blank histograms for columns with data starting near zero.
---
 web-common/scripts/generate-query-hooks.ts    |   4 +-
 .../v2/gen/connector-service.ts               |  47 ++-
 .../runtime-client/v2/gen/query-service.ts    | 207 ++++++++++--
 .../runtime-client/v2/gen/runtime-service.ts  | 318 +++++++++++++++---
 4 files changed, 487 insertions(+), 89 deletions(-)

diff --git a/web-common/scripts/generate-query-hooks.ts b/web-common/scripts/generate-query-hooks.ts
index 186974e314f..dab7be7f933 100644
--- a/web-common/scripts/generate-query-hooks.ts
+++ b/web-common/scripts/generate-query-hooks.ts
@@ -282,7 +282,7 @@ function generateServiceFile(service: ServiceDef): string {
       `  return client.${serviceClientProp}.${m.methodKey}(`,
       `    ${m.inputType}.fromJson(stripUndefined(${requestSpread}) as unknown as JsonValue),`,
       `    { signal: options?.signal },`,
-      `  ).then(r => r.toJson() as unknown as ${responseType});`,
+      `  ).then(r => r.toJson({ emitDefaultValues: true }) as unknown as ${responseType});`,
       `}`,
       ``,
     );
@@ -366,7 +366,7 @@ function generateServiceFile(service: ServiceDef): string {
       `): Promise<${responseType}> {`,
       `  return client.${serviceClientProp}.${m.methodKey}(`,
       `    ${m.inputType}.fromJson(stripUndefined(${requestSpread}) as unknown as JsonValue),`,
-      `  ).then(r => r.toJson() as unknown as ${responseType});`,
+      `  ).then(r => r.toJson({ emitDefaultValues: true }) as unknown as ${responseType});`,
       `}`,
       ``,
     );
diff --git a/web-common/src/runtime-client/v2/gen/connector-service.ts b/web-common/src/runtime-client/v2/gen/connector-service.ts
index a240b5cc2e3..782e82a840a 100644
--- a/web-common/src/runtime-client/v2/gen/connector-service.ts
+++ b/web-common/src/runtime-client/v2/gen/connector-service.ts
@@ -58,7 +58,12 @@ export function connectorServiceListBuckets(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListBucketsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListBucketsResponse,
+    );
 }
 
 export function getConnectorServiceListBucketsQueryKey(
@@ -136,7 +141,12 @@ export function connectorServiceListObjects(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListObjectsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListObjectsResponse,
+    );
 }
 
 export function getConnectorServiceListObjectsQueryKey(
@@ -214,7 +224,12 @@ export function connectorServiceOLAPListTables(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1OLAPListTablesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1OLAPListTablesResponse,
+    );
 }
 
 export function getConnectorServiceOLAPListTablesQueryKey(
@@ -292,7 +307,12 @@ export function connectorServiceOLAPGetTable(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1OLAPGetTableResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1OLAPGetTableResponse,
+    );
 }
 
 export function getConnectorServiceOLAPGetTableQueryKey(
@@ -370,7 +390,12 @@ export function connectorServiceListDatabaseSchemas(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListDatabaseSchemasResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListDatabaseSchemasResponse,
+    );
 }
 
 export function getConnectorServiceListDatabaseSchemasQueryKey(
@@ -452,7 +477,12 @@ export function connectorServiceListTables(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListTablesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListTablesResponse,
+    );
 }
 
 export function getConnectorServiceListTablesQueryKey(
@@ -523,7 +553,10 @@ export function connectorServiceGetTable(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1GetTableResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1GetTableResponse,
+    );
 }
 
 export function getConnectorServiceGetTableQueryKey(
diff --git a/web-common/src/runtime-client/v2/gen/query-service.ts b/web-common/src/runtime-client/v2/gen/query-service.ts
index e4961c21dc4..f6988272e8f 100644
--- a/web-common/src/runtime-client/v2/gen/query-service.ts
+++ b/web-common/src/runtime-client/v2/gen/query-service.ts
@@ -125,7 +125,12 @@ export function queryServiceMetricsViewAggregation(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewAggregationResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewAggregationResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewAggregationQueryKey(
@@ -208,7 +213,12 @@ export function queryServiceMetricsViewToplist(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewToplistResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewToplistResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewToplistQueryKey(
@@ -290,7 +300,12 @@ export function queryServiceMetricsViewComparison(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewComparisonResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewComparisonResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewComparisonQueryKey(
@@ -373,7 +388,12 @@ export function queryServiceMetricsViewTimeSeries(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewTimeSeriesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewTimeSeriesResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewTimeSeriesQueryKey(
@@ -456,7 +476,12 @@ export function queryServiceMetricsViewTotals(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewTotalsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewTotalsResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewTotalsQueryKey(
@@ -538,7 +563,12 @@ export function queryServiceMetricsViewRows(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewRowsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewRowsResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewRowsQueryKey(
@@ -620,7 +650,12 @@ export function queryServiceMetricsViewTimeRange(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewTimeRangeResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewTimeRangeResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewTimeRangeQueryKey(
@@ -702,7 +737,12 @@ export function queryServiceMetricsViewSchema(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewSchemaResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewSchemaResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewSchemaQueryKey(
@@ -784,7 +824,12 @@ export function queryServiceMetricsViewSearch(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewSearchResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewSearchResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewSearchQueryKey(
@@ -866,7 +911,12 @@ export function queryServiceMetricsViewTimeRanges(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewTimeRangesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewTimeRangesResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewTimeRangesQueryKey(
@@ -949,7 +999,12 @@ export function queryServiceMetricsViewAnnotations(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1MetricsViewAnnotationsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1MetricsViewAnnotationsResponse,
+    );
 }
 
 export function getQueryServiceMetricsViewAnnotationsQueryKey(
@@ -1036,7 +1091,10 @@ export function queryServiceConvertExpressionToMetricsSQL(
       { signal: options?.signal },
     )
     .then(
-      (r) => r.toJson() as unknown as V1ConvertExpressionToMetricsSQLResponse,
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ConvertExpressionToMetricsSQLResponse,
     );
 }
 
@@ -1131,7 +1189,12 @@ export function queryServiceResolveCanvas(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ResolveCanvasResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ResolveCanvasResponse,
+    );
 }
 
 export function getQueryServiceResolveCanvasQueryKey(
@@ -1204,7 +1267,12 @@ export function queryServiceResolveComponent(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ResolveComponentResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ResolveComponentResponse,
+    );
 }
 
 export function getQueryServiceResolveComponentQueryKey(
@@ -1286,7 +1354,12 @@ export function queryServiceResolveTemplatedString(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ResolveTemplatedStringResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ResolveTemplatedStringResponse,
+    );
 }
 
 export function getQueryServiceResolveTemplatedStringQueryKey(
@@ -1369,7 +1442,12 @@ export function queryServiceColumnRollupInterval(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnRollupIntervalResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnRollupIntervalResponse,
+    );
 }
 
 export function getQueryServiceColumnRollupIntervalQueryKey(
@@ -1451,7 +1529,12 @@ export function queryServiceColumnTopK(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnTopKResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnTopKResponse,
+    );
 }
 
 export function getQueryServiceColumnTopKQueryKey(
@@ -1522,7 +1605,12 @@ export function queryServiceColumnNullCount(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnNullCountResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnNullCountResponse,
+    );
 }
 
 export function getQueryServiceColumnNullCountQueryKey(
@@ -1605,7 +1693,10 @@ export function queryServiceColumnDescriptiveStatistics(
       { signal: options?.signal },
     )
     .then(
-      (r) => r.toJson() as unknown as V1ColumnDescriptiveStatisticsResponse,
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnDescriptiveStatisticsResponse,
     );
 }
 
@@ -1691,7 +1782,12 @@ export function queryServiceColumnTimeGrain(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnTimeGrainResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnTimeGrainResponse,
+    );
 }
 
 export function getQueryServiceColumnTimeGrainQueryKey(
@@ -1773,7 +1869,12 @@ export function queryServiceColumnNumericHistogram(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnNumericHistogramResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnNumericHistogramResponse,
+    );
 }
 
 export function getQueryServiceColumnNumericHistogramQueryKey(
@@ -1856,7 +1957,12 @@ export function queryServiceColumnRugHistogram(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnRugHistogramResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnRugHistogramResponse,
+    );
 }
 
 export function getQueryServiceColumnRugHistogramQueryKey(
@@ -1938,7 +2044,12 @@ export function queryServiceColumnTimeRange(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnTimeRangeResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnTimeRangeResponse,
+    );
 }
 
 export function getQueryServiceColumnTimeRangeQueryKey(
@@ -2020,7 +2131,12 @@ export function queryServiceColumnCardinality(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnCardinalityResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnCardinalityResponse,
+    );
 }
 
 export function getQueryServiceColumnCardinalityQueryKey(
@@ -2102,7 +2218,12 @@ export function queryServiceColumnTimeSeries(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ColumnTimeSeriesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ColumnTimeSeriesResponse,
+    );
 }
 
 export function getQueryServiceColumnTimeSeriesQueryKey(
@@ -2184,7 +2305,12 @@ export function queryServiceTableCardinality(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1TableCardinalityResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1TableCardinalityResponse,
+    );
 }
 
 export function getQueryServiceTableCardinalityQueryKey(
@@ -2266,7 +2392,12 @@ export function queryServiceTableColumns(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1TableColumnsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1TableColumnsResponse,
+    );
 }
 
 export function getQueryServiceTableColumnsQueryKey(
@@ -2337,7 +2468,10 @@ export function queryServiceTableRows(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1TableRowsResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1TableRowsResponse,
+    );
 }
 
 export function getQueryServiceTableRowsQueryKey(
@@ -2403,7 +2537,10 @@ export function queryServiceQuery(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1QueryResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1QueryResponse,
+    );
 }
 
 export function getQueryServiceQueryMutationOptions(
@@ -2461,7 +2598,10 @@ export function queryServiceExport(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1ExportResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1ExportResponse,
+    );
 }
 
 export function getQueryServiceExportMutationOptions(
@@ -2519,7 +2659,12 @@ export function queryServiceExportReport(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1ExportReportResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ExportReportResponse,
+    );
 }
 
 export function getQueryServiceExportReportMutationOptions(
diff --git a/web-common/src/runtime-client/v2/gen/runtime-service.ts b/web-common/src/runtime-client/v2/gen/runtime-service.ts
index 7f4e61f6d3b..ae179bc69fa 100644
--- a/web-common/src/runtime-client/v2/gen/runtime-service.ts
+++ b/web-common/src/runtime-client/v2/gen/runtime-service.ts
@@ -139,7 +139,9 @@ export function runtimeServicePing(
       PingRequest.fromJson(stripUndefined(request) as unknown as JsonValue),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1PingResponse);
+    .then(
+      (r) => r.toJson({ emitDefaultValues: true }) as unknown as V1PingResponse,
+    );
 }
 
 export function getRuntimeServicePingQueryKey(
@@ -198,7 +200,10 @@ export function runtimeServiceHealth(
       HealthRequest.fromJson(stripUndefined(request) as unknown as JsonValue),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1HealthResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1HealthResponse,
+    );
 }
 
 export function getRuntimeServiceHealthQueryKey(
@@ -262,7 +267,12 @@ export function runtimeServiceInstanceHealth(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1InstanceHealthResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1InstanceHealthResponse,
+    );
 }
 
 export function getRuntimeServiceInstanceHealthQueryKey(
@@ -337,7 +347,12 @@ export function runtimeServiceListInstances(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListInstancesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListInstancesResponse,
+    );
 }
 
 export function getRuntimeServiceListInstancesQueryKey(
@@ -415,7 +430,12 @@ export function runtimeServiceGetInstance(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1GetInstanceResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GetInstanceResponse,
+    );
 }
 
 export function getRuntimeServiceGetInstanceQueryKey(
@@ -486,7 +506,10 @@ export function runtimeServiceListFiles(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListFilesResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1ListFilesResponse,
+    );
 }
 
 export function getRuntimeServiceListFilesQueryKey(
@@ -557,7 +580,10 @@ export function runtimeServiceGetFile(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1GetFileResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1GetFileResponse,
+    );
 }
 
 export function getRuntimeServiceGetFileQueryKey(
@@ -620,7 +646,12 @@ export function runtimeServiceListExamples(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListExamplesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListExamplesResponse,
+    );
 }
 
 export function getRuntimeServiceListExamplesQueryKey(
@@ -693,7 +724,12 @@ export function runtimeServiceQueryResolver(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1QueryResolverResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1QueryResolverResponse,
+    );
 }
 
 export function getRuntimeServiceQueryResolverQueryKey(
@@ -771,7 +807,10 @@ export function runtimeServiceGetLogs(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1GetLogsResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1GetLogsResponse,
+    );
 }
 
 export function getRuntimeServiceGetLogsQueryKey(
@@ -837,7 +876,12 @@ export function runtimeServiceListResources(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListResourcesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListResourcesResponse,
+    );
 }
 
 export function getRuntimeServiceListResourcesQueryKey(
@@ -915,7 +959,12 @@ export function runtimeServiceGetResource(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1GetResourceResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GetResourceResponse,
+    );
 }
 
 export function getRuntimeServiceGetResourceQueryKey(
@@ -986,7 +1035,12 @@ export function runtimeServiceGetExplore(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1GetExploreResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GetExploreResponse,
+    );
 }
 
 export function getRuntimeServiceGetExploreQueryKey(
@@ -1057,7 +1111,12 @@ export function runtimeServiceGetModelPartitions(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1GetModelPartitionsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GetModelPartitionsResponse,
+    );
 }
 
 export function getRuntimeServiceGetModelPartitionsQueryKey(
@@ -1136,7 +1195,12 @@ export function runtimeServiceListConnectorDrivers(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListConnectorDriversResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListConnectorDriversResponse,
+    );
 }
 
 export function getRuntimeServiceListConnectorDriversQueryKey(
@@ -1218,7 +1282,12 @@ export function runtimeServiceAnalyzeConnectors(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1AnalyzeConnectorsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1AnalyzeConnectorsResponse,
+    );
 }
 
 export function getRuntimeServiceAnalyzeConnectorsQueryKey(
@@ -1300,7 +1369,12 @@ export function runtimeServiceListNotifierConnectors(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListNotifierConnectorsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListNotifierConnectorsResponse,
+    );
 }
 
 export function getRuntimeServiceListNotifierConnectorsQueryKey(
@@ -1383,7 +1457,12 @@ export function runtimeServiceListConversations(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListConversationsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListConversationsResponse,
+    );
 }
 
 export function getRuntimeServiceListConversationsQueryKey(
@@ -1465,7 +1544,12 @@ export function runtimeServiceGetConversation(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1GetConversationResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GetConversationResponse,
+    );
 }
 
 export function getRuntimeServiceGetConversationQueryKey(
@@ -1547,7 +1631,10 @@ export function runtimeServiceListTools(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListToolsResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1ListToolsResponse,
+    );
 }
 
 export function getRuntimeServiceListToolsQueryKey(
@@ -1615,7 +1702,12 @@ export function runtimeServiceIssueDevJWT(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1IssueDevJWTResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1IssueDevJWTResponse,
+    );
 }
 
 export function getRuntimeServiceIssueDevJWTQueryKey(
@@ -1686,7 +1778,12 @@ export function runtimeServiceAnalyzeVariables(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1AnalyzeVariablesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1AnalyzeVariablesResponse,
+    );
 }
 
 export function getRuntimeServiceAnalyzeVariablesQueryKey(
@@ -1768,7 +1865,12 @@ export function runtimeServiceListGitCommits(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListGitCommitsResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListGitCommitsResponse,
+    );
 }
 
 export function getRuntimeServiceListGitCommitsQueryKey(
@@ -1846,7 +1948,12 @@ export function runtimeServiceListGitBranches(
       ),
       { signal: options?.signal },
     )
-    .then((r) => r.toJson() as unknown as V1ListGitBranchesResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ListGitBranchesResponse,
+    );
 }
 
 export function getRuntimeServiceListGitBranchesQueryKey(
@@ -1926,7 +2033,12 @@ export function runtimeServiceCreateInstance(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1CreateInstanceResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1CreateInstanceResponse,
+    );
 }
 
 export function getRuntimeServiceCreateInstanceMutationOptions(
@@ -1987,7 +2099,12 @@ export function runtimeServiceEditInstance(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1EditInstanceResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1EditInstanceResponse,
+    );
 }
 
 export function getRuntimeServiceEditInstanceMutationOptions(
@@ -2048,7 +2165,12 @@ export function runtimeServiceDeleteInstance(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1DeleteInstanceResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1DeleteInstanceResponse,
+    );
 }
 
 export function getRuntimeServiceDeleteInstanceMutationOptions(
@@ -2109,7 +2231,12 @@ export function runtimeServiceReloadConfig(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1ReloadConfigResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ReloadConfigResponse,
+    );
 }
 
 export function getRuntimeServiceReloadConfigMutationOptions(
@@ -2170,7 +2297,10 @@ export function runtimeServicePutFile(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1PutFileResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1PutFileResponse,
+    );
 }
 
 export function getRuntimeServicePutFileMutationOptions(
@@ -2231,7 +2361,12 @@ export function runtimeServiceCreateDirectory(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1CreateDirectoryResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1CreateDirectoryResponse,
+    );
 }
 
 export function getRuntimeServiceCreateDirectoryMutationOptions(
@@ -2292,7 +2427,12 @@ export function runtimeServiceDeleteFile(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1DeleteFileResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1DeleteFileResponse,
+    );
 }
 
 export function getRuntimeServiceDeleteFileMutationOptions(
@@ -2353,7 +2493,12 @@ export function runtimeServiceRenameFile(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1RenameFileResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1RenameFileResponse,
+    );
 }
 
 export function getRuntimeServiceRenameFileMutationOptions(
@@ -2414,7 +2559,12 @@ export function runtimeServiceUnpackExample(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1UnpackExampleResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1UnpackExampleResponse,
+    );
 }
 
 export function getRuntimeServiceUnpackExampleMutationOptions(
@@ -2475,7 +2625,12 @@ export function runtimeServiceUnpackEmpty(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1UnpackEmptyResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1UnpackEmptyResponse,
+    );
 }
 
 export function getRuntimeServiceUnpackEmptyMutationOptions(
@@ -2536,7 +2691,12 @@ export function runtimeServiceGenerateMetricsViewFile(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GenerateMetricsViewFileResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GenerateMetricsViewFileResponse,
+    );
 }
 
 export function getRuntimeServiceGenerateMetricsViewFileMutationOptions(
@@ -2596,7 +2756,12 @@ export function runtimeServiceGenerateCanvasFile(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GenerateCanvasFileResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GenerateCanvasFileResponse,
+    );
 }
 
 export function getRuntimeServiceGenerateCanvasFileMutationOptions(
@@ -2657,7 +2822,12 @@ export function runtimeServiceGenerateResolver(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GenerateResolverResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GenerateResolverResponse,
+    );
 }
 
 export function getRuntimeServiceGenerateResolverMutationOptions(
@@ -2718,7 +2888,12 @@ export function runtimeServiceGenerateRenderer(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GenerateRendererResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GenerateRendererResponse,
+    );
 }
 
 export function getRuntimeServiceGenerateRendererMutationOptions(
@@ -2779,7 +2954,12 @@ export function runtimeServiceCreateTrigger(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1CreateTriggerResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1CreateTriggerResponse,
+    );
 }
 
 export function getRuntimeServiceCreateTriggerMutationOptions(
@@ -2840,7 +3020,12 @@ export function runtimeServiceShareConversation(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1ShareConversationResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ShareConversationResponse,
+    );
 }
 
 export function getRuntimeServiceShareConversationMutationOptions(
@@ -2901,7 +3086,12 @@ export function runtimeServiceForkConversation(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1ForkConversationResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1ForkConversationResponse,
+    );
 }
 
 export function getRuntimeServiceForkConversationMutationOptions(
@@ -2962,7 +3152,10 @@ export function runtimeServiceComplete(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1CompleteResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1CompleteResponse,
+    );
 }
 
 export function getRuntimeServiceCompleteMutationOptions(
@@ -3023,7 +3216,10 @@ export function runtimeServiceGitStatus(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GitStatusResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1GitStatusResponse,
+    );
 }
 
 export function getRuntimeServiceGitStatusMutationOptions(
@@ -3084,7 +3280,10 @@ export function runtimeServiceGitCommit(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GitCommitResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1GitCommitResponse,
+    );
 }
 
 export function getRuntimeServiceGitCommitMutationOptions(
@@ -3145,7 +3344,12 @@ export function runtimeServiceRestoreGitCommit(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1RestoreGitCommitResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1RestoreGitCommitResponse,
+    );
 }
 
 export function getRuntimeServiceRestoreGitCommitMutationOptions(
@@ -3206,7 +3410,12 @@ export function runtimeServiceGitMergeToBranch(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GitMergeToBranchResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GitMergeToBranchResponse,
+    );
 }
 
 export function getRuntimeServiceGitMergeToBranchMutationOptions(
@@ -3267,7 +3476,12 @@ export function runtimeServiceGitSwitchBranch(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GitSwitchBranchResponse);
+    .then(
+      (r) =>
+        r.toJson({
+          emitDefaultValues: true,
+        }) as unknown as V1GitSwitchBranchResponse,
+    );
 }
 
 export function getRuntimeServiceGitSwitchBranchMutationOptions(
@@ -3328,7 +3542,10 @@ export function runtimeServiceGitPull(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GitPullResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1GitPullResponse,
+    );
 }
 
 export function getRuntimeServiceGitPullMutationOptions(
@@ -3389,7 +3606,10 @@ export function runtimeServiceGitPush(
         }) as unknown as JsonValue,
       ),
     )
-    .then((r) => r.toJson() as unknown as V1GitPushResponse);
+    .then(
+      (r) =>
+        r.toJson({ emitDefaultValues: true }) as unknown as V1GitPushResponse,
+    );
 }
 
 export function getRuntimeServiceGitPushMutationOptions(

From 301244f7fd149a871ca8b5f15f2f437c5d8ed225 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 17:47:03 +0300
Subject: [PATCH 10/27] fix: deep-strip undefined values in `stripUndefined`
 for nested request objects

The shallow `stripUndefined` only removed top-level undefined values.
Nested objects like `timeRange: { start: undefined }` passed through
to `fromJson()` which rejects undefined, causing JSON decode errors.
---
 web-common/scripts/generate-query-hooks.ts    | 19 +++++++++++++++--
 .../v2/gen/connector-service.ts               | 21 +++++++++++++++----
 .../runtime-client/v2/gen/query-service.ts    | 21 +++++++++++++++----
 .../runtime-client/v2/gen/runtime-service.ts  | 21 +++++++++++++++----
 4 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/web-common/scripts/generate-query-hooks.ts b/web-common/scripts/generate-query-hooks.ts
index dab7be7f933..be1e95c5879 100644
--- a/web-common/scripts/generate-query-hooks.ts
+++ b/web-common/scripts/generate-query-hooks.ts
@@ -241,10 +241,25 @@ function generateServiceFile(service: ServiceDef): string {
   // (proto fromJson rejects undefined; Orval's HTTP client silently omitted them)
   lines.push(
     ``,
-    `/** Strip undefined values — proto fromJson rejects them */`,
+    `/** Deep-strip undefined values — proto fromJson rejects them */`,
     `// eslint-disable-next-line @typescript-eslint/no-explicit-any`,
     `function stripUndefined(obj: Record<string, any>): Record<string, unknown> {`,
-    `  return Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== undefined));`,
+    `  const result: Record<string, unknown> = {};`,
+    `  for (const [key, value] of Object.entries(obj)) {`,
+    `    if (value === undefined) continue;`,
+    `    if (Array.isArray(value)) {`,
+    `      result[key] = value.map((item) =>`,
+    `        item && typeof item === "object" && !Array.isArray(item)`,
+    `          ? stripUndefined(item)`,
+    `          : item,`,
+    `      );`,
+    `    } else if (value && typeof value === "object" && !(value instanceof Date)) {`,
+    `      result[key] = stripUndefined(value);`,
+    `    } else {`,
+    `      result[key] = value;`,
+    `    }`,
+    `  }`,
+    `  return result;`,
     `}`,
   );
 
diff --git a/web-common/src/runtime-client/v2/gen/connector-service.ts b/web-common/src/runtime-client/v2/gen/connector-service.ts
index 782e82a840a..fafdd528f2e 100644
--- a/web-common/src/runtime-client/v2/gen/connector-service.ts
+++ b/web-common/src/runtime-client/v2/gen/connector-service.ts
@@ -32,12 +32,25 @@ import {
   OLAPListTablesRequest,
 } from "../../../proto/gen/rill/runtime/v1/connectors_pb";
 
-/** Strip undefined values — proto fromJson rejects them */
+/** Deep-strip undefined values — proto fromJson rejects them */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function stripUndefined(obj: Record<string, any>): Record<string, unknown> {
-  return Object.fromEntries(
-    Object.entries(obj).filter(([, v]) => v !== undefined),
-  );
+  const result: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (value === undefined) continue;
+    if (Array.isArray(value)) {
+      result[key] = value.map((item) =>
+        item && typeof item === "object" && !Array.isArray(item)
+          ? stripUndefined(item)
+          : item,
+      );
+    } else if (value && typeof value === "object" && !(value instanceof Date)) {
+      result[key] = stripUndefined(value);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
 }
 
 /**
diff --git a/web-common/src/runtime-client/v2/gen/query-service.ts b/web-common/src/runtime-client/v2/gen/query-service.ts
index f6988272e8f..209ca53c250 100644
--- a/web-common/src/runtime-client/v2/gen/query-service.ts
+++ b/web-common/src/runtime-client/v2/gen/query-service.ts
@@ -99,12 +99,25 @@ import {
   TableRowsRequest,
 } from "../../../proto/gen/rill/runtime/v1/queries_pb";
 
-/** Strip undefined values — proto fromJson rejects them */
+/** Deep-strip undefined values — proto fromJson rejects them */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function stripUndefined(obj: Record<string, any>): Record<string, unknown> {
-  return Object.fromEntries(
-    Object.entries(obj).filter(([, v]) => v !== undefined),
-  );
+  const result: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (value === undefined) continue;
+    if (Array.isArray(value)) {
+      result[key] = value.map((item) =>
+        item && typeof item === "object" && !Array.isArray(item)
+          ? stripUndefined(item)
+          : item,
+      );
+    } else if (value && typeof value === "object" && !(value instanceof Date)) {
+      result[key] = stripUndefined(value);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
 }
 
 /**
diff --git a/web-common/src/runtime-client/v2/gen/runtime-service.ts b/web-common/src/runtime-client/v2/gen/runtime-service.ts
index ae179bc69fa..5446b9b5a7a 100644
--- a/web-common/src/runtime-client/v2/gen/runtime-service.ts
+++ b/web-common/src/runtime-client/v2/gen/runtime-service.ts
@@ -118,12 +118,25 @@ import {
   UnpackExampleRequest,
 } from "../../../proto/gen/rill/runtime/v1/api_pb";
 
-/** Strip undefined values — proto fromJson rejects them */
+/** Deep-strip undefined values — proto fromJson rejects them */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function stripUndefined(obj: Record<string, any>): Record<string, unknown> {
-  return Object.fromEntries(
-    Object.entries(obj).filter(([, v]) => v !== undefined),
-  );
+  const result: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (value === undefined) continue;
+    if (Array.isArray(value)) {
+      result[key] = value.map((item) =>
+        item && typeof item === "object" && !Array.isArray(item)
+          ? stripUndefined(item)
+          : item,
+      );
+    } else if (value && typeof value === "object" && !(value instanceof Date)) {
+      result[key] = stripUndefined(value);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
 }
 
 /**

From 840e75730b0e07f20b75a5bc64cd1bca5b0d4526 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Wed, 25 Feb 2026 12:29:57 +0300
Subject: [PATCH 11/27] feat: port request queue to ConnectRPC transport
 interceptor

Port the two-level heap request queue as a ConnectRPC interceptor.
Maps method names (instead of URLs) to priorities and controls
concurrency via the same architecture as HttpRequestQueue.
---
 web-common/src/runtime-client/v2/heap.ts      | 129 +++++++++
 .../runtime-client/v2/request-priorities.ts   |  37 +++
 .../src/runtime-client/v2/request-queue.ts    | 271 ++++++++++++++++++
 .../src/runtime-client/v2/runtime-client.ts   |   6 +
 4 files changed, 443 insertions(+)
 create mode 100644 web-common/src/runtime-client/v2/heap.ts
 create mode 100644 web-common/src/runtime-client/v2/request-priorities.ts
 create mode 100644 web-common/src/runtime-client/v2/request-queue.ts

diff --git a/web-common/src/runtime-client/v2/heap.ts b/web-common/src/runtime-client/v2/heap.ts
new file mode 100644
index 00000000000..3780f3f019d
--- /dev/null
+++ b/web-common/src/runtime-client/v2/heap.ts
@@ -0,0 +1,129 @@
+/**
+ * Generic binary max-heap with O(log n) insert/update and O(1) key-based lookup.
+ * Ported from http-request-queue/Heap.ts for use with ConnectRPC request queue.
+ */
+export class Heap<Item extends { index?: number }, Key = string> {
+  private readonly array: Array<Item> = [];
+  private valueToIdxMap: Map<Key, number> = new Map();
+
+  constructor(
+    private readonly compareFunction: (a: Item, b: Item) => number,
+    private readonly keyGetter: (a: Item) => Key,
+  ) {}
+
+  public empty() {
+    return this.array.length === 0;
+  }
+
+  public peek(): Item {
+    return this.array[0];
+  }
+
+  public get(key: Key): Item | undefined {
+    const idx = this.valueToIdxMap.get(key);
+    if (idx === undefined) return undefined;
+    return this.array[idx];
+  }
+
+  public push(value: Item) {
+    this.setIndex(value, this.array.length);
+    this.array.push(value);
+    this.moveUp(this.array.length - 1);
+  }
+
+  public pop() {
+    if (this.array.length > 0) {
+      const value = this.array[0];
+      this.valueToIdxMap.delete(this.keyGetter(value));
+      if (this.array.length > 1) {
+        this.array[0] = this.array.pop()!;
+        this.setIndex(this.array[0], 0);
+        this.moveDown(0);
+      } else {
+        this.array.pop();
+      }
+      return value;
+    }
+  }
+
+  public delete(value: Item | undefined, key?: Key) {
+    key ??= this.keyGetter(value!);
+    const idx = value?.index ?? this.valueToIdxMap.get(key);
+    if (idx === undefined || idx < 0) return;
+
+    value = this.array[idx];
+    this.valueToIdxMap.delete(key);
+    delete value.index;
+    if (idx < this.array.length - 1) {
+      this.array[idx] = this.array.pop()!;
+      this.array[idx].index = idx;
+      this.setIndex(this.array[idx], idx);
+      this.moveDown(idx);
+    } else {
+      this.array.pop();
+    }
+  }
+
+  public updateItem(value: Item) {
+    const idx = value.index ?? this.valueToIdxMap.get(this.keyGetter(value));
+    if (idx === undefined || idx < 0) return;
+    if (!this.moveUp(idx)) {
+      this.moveDown(idx);
+    }
+  }
+
+  private moveUp(idx: number) {
+    let movedUp = false;
+    while (idx > 0) {
+      const parentIdx = (idx - 1) >> 1;
+      if (this.compareFunction(this.array[idx], this.array[parentIdx]) > 0) {
+        this.swap(idx, parentIdx);
+        idx = parentIdx;
+        movedUp = true;
+      } else {
+        break;
+      }
+    }
+    return movedUp;
+  }
+
+  private moveDown(idx: number) {
+    let movedDown = false;
+    while (idx < this.array.length) {
+      let childIdx = 2 * idx + 1;
+
+      if (childIdx >= this.array.length) {
+        break;
+      }
+
+      if (
+        childIdx + 1 < this.array.length &&
+        this.compareFunction(this.array[childIdx + 1], this.array[childIdx]) > 0
+      ) {
+        childIdx++;
+      }
+
+      if (this.compareFunction(this.array[childIdx], this.array[idx]) > 0) {
+        this.swap(idx, childIdx);
+        idx = childIdx;
+        movedDown = true;
+      } else {
+        break;
+      }
+    }
+    return movedDown;
+  }
+
+  private swap(idx0: number, idx1: number) {
+    const val0 = this.array[idx0];
+    this.array[idx0] = this.array[idx1];
+    this.array[idx1] = val0;
+    this.setIndex(this.array[idx0], idx0);
+    this.setIndex(this.array[idx1], idx1);
+  }
+
+  private setIndex(item: Item, index: number) {
+    this.valueToIdxMap.set(this.keyGetter(item), index);
+    item.index = index;
+  }
+}
diff --git a/web-common/src/runtime-client/v2/request-priorities.ts b/web-common/src/runtime-client/v2/request-priorities.ts
new file mode 100644
index 00000000000..a9be73f4790
--- /dev/null
+++ b/web-common/src/runtime-client/v2/request-priorities.ts
@@ -0,0 +1,37 @@
+/**
+ * Priority mapping for ConnectRPC method names.
+ * Mirrors the URL-based priorities from http-request-queue/priorities.ts,
+ * mapped to ConnectRPC service method names instead of URL path segments.
+ */
+
+// Maps ConnectRPC method names to priority weights.
+// Higher priority = dispatched first.
+const MethodPriorities: Record<string, number> = {
+  // High priority: user-visible data
+  MetricsViewRows: 50,
+  MetricsViewTimeRange: 50,
+  ColumnProfile: 45,
+
+  // Medium: charts and summaries
+  ColumnNullCount: 40,
+  TableCardinality: 35,
+  ColumnCardinality: 35,
+  MetricsViewAggregation: 30,
+  MetricsViewTimeSeries: 30,
+  NumericHistogram: 30,
+  MetricsViewTotals: 30,
+
+  // Low: exploratory queries
+  MetricsViewToplist: 10,
+  RugHistogram: 10,
+  DescriptiveStatistics: 10,
+};
+
+export const DEFAULT_PRIORITY = 10;
+export const ACTIVE_COLUMN_PRIORITY_OFFSET = 50;
+export const ACTIVE_PRIORITY = 10;
+export const INACTIVE_PRIORITY = 5;
+
+export function getPriorityForMethod(methodName: string): number {
+  return MethodPriorities[methodName] ?? DEFAULT_PRIORITY;
+}
diff --git a/web-common/src/runtime-client/v2/request-queue.ts b/web-common/src/runtime-client/v2/request-queue.ts
new file mode 100644
index 00000000000..801c3c06118
--- /dev/null
+++ b/web-common/src/runtime-client/v2/request-queue.ts
@@ -0,0 +1,271 @@
+import type { Interceptor } from "@connectrpc/connect";
+import { appQueryStatusStore } from "../application-store";
+import { Heap } from "./heap";
+import {
+  ACTIVE_COLUMN_PRIORITY_OFFSET,
+  ACTIVE_PRIORITY,
+  INACTIVE_PRIORITY,
+  getPriorityForMethod,
+} from "./request-priorities";
+
+interface QueueEntry {
+  key: string;
+  weight: number;
+  id: number;
+  columnName?: string;
+
+  resolve?: (value: unknown) => void;
+  reject?: (reason: unknown) => void;
+  fn?: () => Promise<unknown>;
+
+  index?: number;
+}
+
+interface NameEntry {
+  name: string;
+  weight: number;
+  columnMap: Map<string, Array<QueueEntry>>;
+  queryHeap: Heap<QueueEntry>;
+
+  index?: number;
+}
+
+function createNameHeap(): Heap<NameEntry> {
+  return new Heap<NameEntry>(
+    (a, b) => a.weight - b.weight,
+    (a) => a.name,
+  );
+}
+
+function createQueryHeap(): Heap<QueueEntry> {
+  return new Heap<QueueEntry>(
+    (a, b) => {
+      if (a.weight === b.weight) {
+        // equal weights: preserve insertion order (lower id = earlier)
+        return b.id - a.id;
+      }
+      return a.weight - b.weight;
+    },
+    (a) => a.key,
+  );
+}
+
+function getDefaultConcurrency(): number {
+  try {
+    if (
+      window.location.protocol === "https:" ||
+      window.location.hostname !== "localhost"
+    ) {
+      return 200;
+    }
+  } catch {
+    // no-op: SSR or test environment
+  }
+  return 5;
+}
+
+export class RequestQueue {
+  private readonly nameHeap = createNameHeap();
+  private activeCount = 0;
+  private ids = 0;
+  private readonly maxConcurrent: number;
+
+  constructor(opts?: { maxConcurrent?: number }) {
+    this.maxConcurrent = opts?.maxConcurrent ?? getDefaultConcurrency();
+  }
+
+  /**
+   * Queue a request. Resolves when the request function completes.
+   * The request won't fire until the queue has capacity.
+   */
+  enqueue<T>(opts: {
+    priority: number;
+    resourceName?: string;
+    columnName?: string;
+    signal?: AbortSignal;
+    fn: () => Promise<T>;
+  }): Promise<T> {
+    const resourceName = opts.resourceName ?? "__default__";
+    const nameEntry = this.getNameEntry(resourceName);
+
+    const entry: QueueEntry = {
+      key: `${opts.columnName ?? ""}:${this.ids}`,
+      weight: opts.priority,
+      id: this.ids++,
+      columnName: opts.columnName,
+      fn: opts.fn as () => Promise<unknown>,
+    };
+
+    if (opts.columnName) {
+      if (!nameEntry.columnMap.has(opts.columnName)) {
+        nameEntry.columnMap.set(opts.columnName, []);
+      }
+      nameEntry.columnMap.get(opts.columnName)!.push(entry);
+    }
+
+    nameEntry.queryHeap.push(entry);
+
+    const promise = new Promise<T>((resolve, reject) => {
+      entry.resolve = resolve as (value: unknown) => void;
+      entry.reject = reject;
+    });
+
+    // If already aborted, reject immediately
+    if (opts.signal?.aborted) {
+      nameEntry.queryHeap.delete(entry);
+      if (entry.columnName) {
+        this.clearEntryForColumn(nameEntry, entry);
+      }
+      if (nameEntry.queryHeap.empty()) {
+        this.nameHeap.delete(nameEntry);
+      }
+      entry.reject?.(opts.signal.reason);
+      return promise;
+    }
+
+    // Handle abort while queued
+    opts.signal?.addEventListener(
+      "abort",
+      () => {
+        // Only remove if still queued (has fn; cleared on fire)
+        if (!entry.fn) return;
+        nameEntry.queryHeap.delete(entry);
+        if (entry.columnName) {
+          this.clearEntryForColumn(nameEntry, entry);
+        }
+        if (nameEntry.queryHeap.empty()) {
+          this.nameHeap.delete(nameEntry);
+        }
+        entry.reject?.(opts.signal!.reason);
+      },
+      { once: true },
+    );
+
+    this.drain();
+    return promise;
+  }
+
+  /** Boost or reduce priority for column-level queries (active column in Explore). */
+  prioritiseColumn(
+    resourceName: string,
+    columnName: string,
+    active: boolean,
+  ): void {
+    const nameEntry = this.nameHeap.get(resourceName);
+    if (!nameEntry) return;
+    const columnEntries = nameEntry.columnMap.get(columnName);
+    if (!columnEntries) return;
+    for (const entry of columnEntries) {
+      if (active && entry.weight < ACTIVE_COLUMN_PRIORITY_OFFSET) {
+        entry.weight += ACTIVE_COLUMN_PRIORITY_OFFSET;
+      } else if (!active && entry.weight > ACTIVE_COLUMN_PRIORITY_OFFSET) {
+        entry.weight -= ACTIVE_COLUMN_PRIORITY_OFFSET;
+      }
+      nameEntry.queryHeap.updateItem(entry);
+    }
+  }
+
+  /** Remove all queued requests for a resource (entity deleted/renamed). */
+  removeByName(resourceName: string): void {
+    this.nameHeap.delete(undefined, resourceName);
+  }
+
+  /** Deprioritize a resource (user navigated away). */
+  inactiveByName(resourceName: string): void {
+    const nameEntry = this.nameHeap.get(resourceName);
+    if (!nameEntry) return;
+    nameEntry.weight = INACTIVE_PRIORITY;
+    this.nameHeap.updateItem(nameEntry);
+  }
+
+  private drain(): void {
+    while (!this.nameHeap.empty() && this.activeCount < this.maxConcurrent) {
+      const topNameEntry = this.nameHeap.peek();
+      const entry = topNameEntry.queryHeap.pop();
+      if (!entry) break;
+
+      this.fireEntry(entry);
+      this.activeCount++;
+
+      if (entry.columnName && topNameEntry.columnMap.has(entry.columnName)) {
+        this.clearEntryForColumn(topNameEntry, entry);
+      }
+
+      if (topNameEntry.queryHeap.empty()) {
+        this.nameHeap.pop();
+      }
+    }
+    appQueryStatusStore.set(this.activeCount > 0);
+  }
+
+  private async fireEntry(entry: QueueEntry): Promise<void> {
+    const fn = entry.fn!;
+    entry.fn = undefined; // mark as fired
+    try {
+      const result = await fn();
+      entry.resolve?.(result);
+    } catch (err) {
+      entry.reject?.(err);
+    }
+    this.activeCount--;
+    appQueryStatusStore.set(this.activeCount > 0);
+    this.drain();
+  }
+
+  private getNameEntry(name: string): NameEntry {
+    let nameEntry = this.nameHeap.get(name);
+    if (!nameEntry) {
+      nameEntry = {
+        name,
+        weight: ACTIVE_PRIORITY,
+        columnMap: new Map(),
+        queryHeap: createQueryHeap(),
+      };
+      this.nameHeap.push(nameEntry);
+    }
+    return nameEntry;
+  }
+
+  private clearEntryForColumn(nameEntry: NameEntry, entry: QueueEntry): void {
+    const entries = nameEntry.columnMap.get(entry.columnName!);
+    if (!entries) return;
+    const idx = entries.indexOf(entry);
+    if (idx !== -1) entries.splice(idx, 1);
+  }
+}
+
+/**
+ * Extract the resource name from a ConnectRPC request message.
+ * Looks for common field patterns in runtime API request messages.
+ */
+function extractResourceName(req: { message: unknown }): string | undefined {
+  const msg = req.message as Record<string, unknown>;
+  // MetricsView queries use metricsViewName or metricsView
+  if (typeof msg.metricsViewName === "string") return msg.metricsViewName;
+  if (typeof msg.metricsView === "string") return msg.metricsView;
+  // Column profiling queries use tableName
+  if (typeof msg.tableName === "string") return msg.tableName;
+  return undefined;
+}
+
+/**
+ * Creates a ConnectRPC interceptor that routes requests through the RequestQueue.
+ * The interceptor wraps the `next()` call so the queue controls when requests fire.
+ */
+export function createQueueInterceptor(queue: RequestQueue): Interceptor {
+  return (next) => async (req) => {
+    const priority = getPriorityForMethod(req.method.name);
+    const resourceName = extractResourceName(req);
+    const columnName = (req.message as Record<string, unknown>).columnName as
+      | string
+      | undefined;
+
+    return queue.enqueue({
+      priority,
+      resourceName,
+      columnName,
+      signal: req.signal,
+      fn: () => next(req),
+    });
+  };
+}
diff --git a/web-common/src/runtime-client/v2/runtime-client.ts b/web-common/src/runtime-client/v2/runtime-client.ts
index fd664a52259..c600c2b1feb 100644
--- a/web-common/src/runtime-client/v2/runtime-client.ts
+++ b/web-common/src/runtime-client/v2/runtime-client.ts
@@ -8,12 +8,14 @@ import {
   JWT_EXPIRY_WARNING_WINDOW,
   CHECK_RUNTIME_STORE_FOR_JWT_INTERVAL,
 } from "../constants";
+import { RequestQueue, createQueueInterceptor } from "./request-queue";
 
 export type AuthContext = "user" | "mock" | "magic" | "embed";
 
 export class RuntimeClient {
   readonly instanceId: string;
   readonly transport: Transport;
+  readonly requestQueue: RequestQueue;
 
   // JWT state (mutable; read by the transport interceptor)
   private currentJwt: string | undefined;
@@ -35,10 +37,14 @@ export class RuntimeClient {
     this.currentJwt = opts.jwt;
     this.jwtReceivedAt = opts.jwt ? Date.now() : 0;
     this.authContext = opts.authContext ?? "user";
+    this.requestQueue = new RequestQueue();
 
     this.transport = createConnectTransport({
       baseUrl: opts.host,
       interceptors: [
+        // Queue controls when requests fire (outermost: wraps everything)
+        createQueueInterceptor(this.requestQueue),
+        // JWT interceptor adds auth header just before the network call
         (next) => async (req) => {
           if (this.currentJwt) {
             await this.waitForFreshJwt();

From ae800e07e01e70063cbf62df6edfa9dd88fac367 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 11:51:12 +0300
Subject: [PATCH 12/27] refactor: migrate connectors and column-profile to v2
 RuntimeClient
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Migrate 8 files from the global runtime store to useRuntimeClient():
- ConnectorExplorer, ConnectorEntry, TableEntry, TableSchema,
  TableMenuItems, TableWorkspaceHeader, ConnectorRefreshButton
- ColumnProfile

Exercises all key migration patterns:
- $runtime.instanceId → useRuntimeClient() + client.instanceId
- Orval createQuery hooks → v2 generated hooks (request object style)
- Orval createMutation → v2 generated mutation hooks
- Structural type compatibility between proto and Orval response types
---
 .../column-profile/ColumnProfile.svelte       | 17 +++----
 .../connectors/ConnectorRefreshButton.svelte  | 13 +++---
 .../connectors/explorer/ConnectorEntry.svelte | 15 +++----
 .../explorer/ConnectorExplorer.svelte         | 45 ++++++++++---------
 .../connectors/explorer/TableEntry.svelte     |  7 +--
 .../connectors/explorer/TableMenuItems.svelte |  5 ++-
 .../connectors/explorer/TableSchema.svelte    |  7 +--
 .../explorer/TableWorkspaceHeader.svelte      |  6 +--
 8 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/web-common/src/features/column-profile/ColumnProfile.svelte b/web-common/src/features/column-profile/ColumnProfile.svelte
index 442a016ff99..ef9421577f1 100644
--- a/web-common/src/features/column-profile/ColumnProfile.svelte
+++ b/web-common/src/features/column-profile/ColumnProfile.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { COLUMN_PROFILE_CONFIG } from "@rilldata/web-common/layout/config";
+  import { onMount } from "svelte";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import {
     createQueryServiceTableColumns,
     createQueryServiceTableRows,
-  } from "@rilldata/web-common/runtime-client";
-  import { onMount } from "svelte";
-  import { runtime } from "../../runtime-client/runtime-store";
+  } from "../../runtime-client/v2/gen";
   import { getColumnType } from "./column-types";
   import { getSummaries } from "./queries";
   import { defaultSort, sortByName, sortByNullity } from "./utils";
@@ -21,7 +21,7 @@
   let mode = "summaries";
   let container;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
   onMount(() => {
     const observer = new ResizeObserver(() => {
@@ -32,9 +32,9 @@
   });
 
   $: profileColumns = createQueryServiceTableColumns(
-    instanceId,
-    objectName,
+    client,
     {
+      tableName: objectName,
       connector,
       database,
       databaseSchema,
@@ -43,7 +43,8 @@
   );
 
   /** get single example */
-  $: exampleValue = createQueryServiceTableRows(instanceId, objectName, {
+  $: exampleValue = createQueryServiceTableRows(client, {
+    tableName: objectName,
     connector,
     database,
     databaseSchema,
@@ -51,7 +52,7 @@
   });
 
   $: nestedColumnProfileQuery = getSummaries(
-    instanceId,
+    client.instanceId,
     connector,
     database,
     databaseSchema,
diff --git a/web-common/src/features/connectors/ConnectorRefreshButton.svelte b/web-common/src/features/connectors/ConnectorRefreshButton.svelte
index e8fb34257ea..60a04b6e530 100644
--- a/web-common/src/features/connectors/ConnectorRefreshButton.svelte
+++ b/web-common/src/features/connectors/ConnectorRefreshButton.svelte
@@ -7,16 +7,16 @@
   import {
     V1ReconcileStatus,
     type V1Resource,
-    createRuntimeServiceCreateTrigger,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+  import { createRuntimeServiceCreateTriggerMutation } from "@rilldata/web-common/runtime-client/v2/gen";
 
   export let resource: V1Resource | undefined;
   export let hasUnsavedChanges = false;
 
-  const triggerMutation = createRuntimeServiceCreateTrigger();
+  const client = useRuntimeClient();
+  const triggerMutation = createRuntimeServiceCreateTriggerMutation(client);
 
-  $: ({ instanceId } = $runtime);
   $: connectorName = resource?.meta?.name?.name;
   $: isReconciling =
     resource?.meta?.reconcileStatus ===
@@ -25,10 +25,7 @@
   function refreshConnector() {
     if (!connectorName) return;
     void $triggerMutation.mutateAsync({
-      instanceId,
-      data: {
-        resources: [{ kind: ResourceKind.Connector, name: connectorName }],
-      },
+      resources: [{ kind: ResourceKind.Connector, name: connectorName }],
     });
   }
 </script>
diff --git a/web-common/src/features/connectors/explorer/ConnectorEntry.svelte b/web-common/src/features/connectors/explorer/ConnectorEntry.svelte
index 56214e50d8b..4887634c34f 100644
--- a/web-common/src/features/connectors/explorer/ConnectorEntry.svelte
+++ b/web-common/src/features/connectors/explorer/ConnectorEntry.svelte
@@ -1,11 +1,9 @@
 <script lang="ts">
   import CaretDownIcon from "../../../components/icons/CaretDownIcon.svelte";
   import { Tag } from "../../../components/tag";
-  import {
-    type V1AnalyzedConnector,
-    createRuntimeServiceGetInstance,
-  } from "../../../runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import type { V1AnalyzedConnector } from "../../../runtime-client";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
+  import { createRuntimeServiceGetInstance } from "../../../runtime-client/v2/gen";
   import type { ConnectorExplorerStore } from "./connector-explorer-store";
   import { connectorIconMapping } from "../connector-icon-mapping";
   import { getConnectorIconKey } from "../connectors-utils";
@@ -14,11 +12,12 @@
   export let connector: V1AnalyzedConnector;
   export let store: ConnectorExplorerStore;
 
+  const client = useRuntimeClient();
+
   $: connectorName = connector?.name as string;
   $: expandedStore = store.getItem(connectorName);
   $: expanded = $expandedStore;
-  $: ({ instanceId } = $runtime);
-  $: instance = createRuntimeServiceGetInstance(instanceId, {
+  $: instance = createRuntimeServiceGetInstance(client, {
     sensitive: true,
   });
   $: olapConnector = $instance.data?.instance?.olapConnector;
@@ -66,7 +65,7 @@
       </button>
 
       {#if expanded}
-        <DatabaseExplorer {instanceId} {connector} {store} />
+        <DatabaseExplorer instanceId={client.instanceId} {connector} {store} />
       {/if}
     </li>
   {/if}
diff --git a/web-common/src/features/connectors/explorer/ConnectorExplorer.svelte b/web-common/src/features/connectors/explorer/ConnectorExplorer.svelte
index a6a6851fae7..8bbcf1877d4 100644
--- a/web-common/src/features/connectors/explorer/ConnectorExplorer.svelte
+++ b/web-common/src/features/connectors/explorer/ConnectorExplorer.svelte
@@ -1,37 +1,40 @@
 <script lang="ts">
   import { slide } from "svelte/transition";
   import { LIST_SLIDE_DURATION as duration } from "../../../layout/config";
-  import { createRuntimeServiceAnalyzeConnectors } from "../../../runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
+  import { createRuntimeServiceAnalyzeConnectors } from "../../../runtime-client/v2/gen";
   import ConnectorEntry from "./ConnectorEntry.svelte";
   import type { ConnectorExplorerStore } from "./connector-explorer-store";
 
   export let store: ConnectorExplorerStore;
   export let olapOnly: boolean = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
-  $: connectors = createRuntimeServiceAnalyzeConnectors(instanceId, {
-    query: {
-      // Retry transient 500s during runtime resets (e.g. project initialization)
-      retry: (failureCount, error) =>
-        !!error?.response?.status &&
-        error.response.status >= 500 &&
-        failureCount < 3,
-      retryDelay: 1000,
-      // sort alphabetically
-      select: (data) => {
-        if (!data?.connectors) return;
+  $: connectors = createRuntimeServiceAnalyzeConnectors(
+    client,
+    {},
+    {
+      query: {
+        // Retry transient errors during runtime resets (e.g. project initialization)
+        retry: (failureCount) => failureCount < 3,
+        retryDelay: 1000,
+        // sort alphabetically
+        select: (data) => {
+          if (!data?.connectors) return;
 
-        const filtered = (
-          olapOnly
-            ? data.connectors.filter((c) => c?.driver?.implementsOlap)
-            : data.connectors
-        ).sort((a, b) => (a?.name as string).localeCompare(b?.name as string));
-        return { connectors: filtered };
+          const filtered = (
+            olapOnly
+              ? data.connectors.filter((c) => c?.driver?.implementsOlap)
+              : data.connectors
+          ).sort((a, b) =>
+            (a?.name as string).localeCompare(b?.name as string),
+          );
+          return { connectors: filtered };
+        },
       },
     },
-  });
+  );
   $: ({ data, error } = $connectors);
 </script>
 
diff --git a/web-common/src/features/connectors/explorer/TableEntry.svelte b/web-common/src/features/connectors/explorer/TableEntry.svelte
index 5a9edd94756..763a1aaccc7 100644
--- a/web-common/src/features/connectors/explorer/TableEntry.svelte
+++ b/web-common/src/features/connectors/explorer/TableEntry.svelte
@@ -8,7 +8,7 @@
   import TableMenuItems from "./TableMenuItems.svelte";
   import TableSchema from "./TableSchema.svelte";
   import { useIsModelingSupportedForConnectorOLAP as useIsModelingSupportedForConnector } from "../selectors";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import type { ConnectorExplorerStore } from "./connector-explorer-store";
   import {
     makeFullyQualifiedTableName,
@@ -27,14 +27,15 @@
 
   let contextMenuOpen = false;
 
+  const client = useRuntimeClient();
+
   $: expandedStore = store.getItem(connector, database, databaseSchema, table);
   $: showSchema = $expandedStore;
 
   const { allowContextMenu, allowNavigateToTable, allowShowSchema } = store;
 
-  $: ({ instanceId: runtimeInstanceId } = $runtime);
   $: isModelingSupportedForConnector = useIsModelingSupportedForConnector(
-    runtimeInstanceId,
+    client.instanceId,
     connector,
   );
   $: isModelingSupported = $isModelingSupportedForConnector.data;
diff --git a/web-common/src/features/connectors/explorer/TableMenuItems.svelte b/web-common/src/features/connectors/explorer/TableMenuItems.svelte
index f3de0cc180d..b0ee5c8dc83 100644
--- a/web-common/src/features/connectors/explorer/TableMenuItems.svelte
+++ b/web-common/src/features/connectors/explorer/TableMenuItems.svelte
@@ -10,7 +10,7 @@
     MetricsEventScreenName,
     MetricsEventSpace,
   } from "@rilldata/web-common/metrics/service/MetricsTypes";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { generateMetricsFromTable } from "../../metrics-views/ai-generation/generateMetricsView";
   import {
     createSqlModelFromTable,
@@ -27,7 +27,8 @@
   export let isModelingSupported: boolean | undefined = false;
   export let isOlapConnector: boolean = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  $: ({ instanceId } = client);
 
   async function handleCreateModel(
     modelCreationFn: () => Promise<[string, string]>,
diff --git a/web-common/src/features/connectors/explorer/TableSchema.svelte b/web-common/src/features/connectors/explorer/TableSchema.svelte
index d4d42c8251d..673c3fdb9d1 100644
--- a/web-common/src/features/connectors/explorer/TableSchema.svelte
+++ b/web-common/src/features/connectors/explorer/TableSchema.svelte
@@ -2,16 +2,17 @@
   import Tooltip from "../../../components/tooltip/Tooltip.svelte";
   import TooltipContent from "../../../components/tooltip/TooltipContent.svelte";
   import { useGetTable } from "../selectors";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
 
   export let connector: string;
   export let database: string = ""; // The backend interprets an empty string as the default database
   export let databaseSchema: string = ""; // The backend interprets an empty string as the default schema
   export let table: string;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+
   $: newTableQuery = useGetTable(
-    instanceId,
+    client.instanceId,
     connector,
     database,
     databaseSchema,
diff --git a/web-common/src/features/connectors/explorer/TableWorkspaceHeader.svelte b/web-common/src/features/connectors/explorer/TableWorkspaceHeader.svelte
index a5bf922344c..40c432e1331 100644
--- a/web-common/src/features/connectors/explorer/TableWorkspaceHeader.svelte
+++ b/web-common/src/features/connectors/explorer/TableWorkspaceHeader.svelte
@@ -9,7 +9,7 @@
   import { WorkspaceHeader } from "../../../layout/workspace";
   import { BehaviourEventMedium } from "../../../metrics/service/BehaviourEventTypes";
   import { MetricsEventSpace } from "../../../metrics/service/MetricsTypes";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { ResourceKind } from "../../entity-management/resource-selectors";
   import { featureFlags } from "../../feature-flags";
   import { useCreateMetricsViewFromTableUIAction } from "../../metrics-views/ai-generation/generateMetricsView";
@@ -21,10 +21,10 @@
 
   const { ai } = featureFlags;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
   $: createMetricsViewFromTable = useCreateMetricsViewFromTableUIAction(
-    instanceId,
+    client.instanceId,
     connector,
     database,
     databaseSchema,

From d7603012e22ce10b49d13e9f425cbe5ede264b49 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 12:17:11 +0300
Subject: [PATCH 13/27] refactor: migrate more connectors components to v2
 RuntimeClient

Migrate DatabaseExplorer, DatabaseEntry, DatabaseSchemaEntry,
TableInspector, and References to use useRuntimeClient() from context.

This demonstrates eliminating instanceId prop drilling: child components
now get the RuntimeClient from Svelte context instead of receiving
instanceId as a prop from parents.
---
 .../connectors/explorer/ConnectorEntry.svelte |  2 +-
 .../connectors/explorer/DatabaseEntry.svelte  |  7 ++--
 .../explorer/DatabaseExplorer.svelte          |  8 +++--
 .../explorer/DatabaseSchemaEntry.svelte       |  6 ++--
 .../connectors/olap/TableInspector.svelte     | 12 ++++---
 .../models/inspector/References.svelte        | 33 ++++++++-----------
 6 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/web-common/src/features/connectors/explorer/ConnectorEntry.svelte b/web-common/src/features/connectors/explorer/ConnectorEntry.svelte
index 4887634c34f..496d34ab8dd 100644
--- a/web-common/src/features/connectors/explorer/ConnectorEntry.svelte
+++ b/web-common/src/features/connectors/explorer/ConnectorEntry.svelte
@@ -65,7 +65,7 @@
       </button>
 
       {#if expanded}
-        <DatabaseExplorer instanceId={client.instanceId} {connector} {store} />
+        <DatabaseExplorer {connector} {store} />
       {/if}
     </li>
   {/if}
diff --git a/web-common/src/features/connectors/explorer/DatabaseEntry.svelte b/web-common/src/features/connectors/explorer/DatabaseEntry.svelte
index 5a60f9708c1..41c5fc0807e 100644
--- a/web-common/src/features/connectors/explorer/DatabaseEntry.svelte
+++ b/web-common/src/features/connectors/explorer/DatabaseEntry.svelte
@@ -4,21 +4,23 @@
   import CaretDownIcon from "../../../components/icons/CaretDownIcon.svelte";
   import { LIST_SLIDE_DURATION as duration } from "../../../layout/config";
   import type { V1AnalyzedConnector } from "../../../runtime-client";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import DatabaseSchemaEntry from "./DatabaseSchemaEntry.svelte";
   import { useListDatabaseSchemas } from "../selectors";
   import type { ConnectorExplorerStore } from "./connector-explorer-store";
 
-  export let instanceId: string;
   export let connector: V1AnalyzedConnector;
   export let database: string;
   export let store: ConnectorExplorerStore;
 
+  const client = useRuntimeClient();
+
   $: connectorName = connector?.name as string;
   $: expandedStore = store.getItem(connectorName, database);
   $: expanded = $expandedStore;
 
   $: databaseSchemasQuery = useListDatabaseSchemas(
-    instanceId,
+    client.instanceId,
     connectorName,
     database,
   );
@@ -60,7 +62,6 @@
         {:else}
           {#each data as schema (schema)}
             <DatabaseSchemaEntry
-              {instanceId}
               {connector}
               {database}
               {store}
diff --git a/web-common/src/features/connectors/explorer/DatabaseExplorer.svelte b/web-common/src/features/connectors/explorer/DatabaseExplorer.svelte
index dc69baed38d..75d6fe4cdb4 100644
--- a/web-common/src/features/connectors/explorer/DatabaseExplorer.svelte
+++ b/web-common/src/features/connectors/explorer/DatabaseExplorer.svelte
@@ -2,21 +2,23 @@
   import { slide } from "svelte/transition";
   import { LIST_SLIDE_DURATION as duration } from "../../../layout/config";
   import type { V1AnalyzedConnector } from "../../../runtime-client";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import DatabaseEntry from "./DatabaseEntry.svelte";
   import { useListDatabaseSchemas } from "../selectors";
   import type { ConnectorExplorerStore } from "./connector-explorer-store";
 
-  export let instanceId: string;
   export let connector: V1AnalyzedConnector;
   export let store: ConnectorExplorerStore;
 
+  const client = useRuntimeClient();
+
   $: connectorName = connector?.name as string;
   $: hasError = !!connector?.errorMessage;
 
   $: queryEnabled = !hasError;
 
   $: databaseSchemasQuery = useListDatabaseSchemas(
-    instanceId,
+    client.instanceId,
     connectorName,
     undefined,
     queryEnabled,
@@ -43,7 +45,7 @@
     {:else}
       <ol transition:slide={{ duration }}>
         {#each data as database (database)}
-          <DatabaseEntry {instanceId} {connector} {database} {store} />
+          <DatabaseEntry {connector} {database} {store} />
         {/each}
       </ol>
     {/if}
diff --git a/web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte b/web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte
index 0992754eb7f..3caf4639953 100644
--- a/web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte
+++ b/web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte
@@ -5,25 +5,27 @@
     V1AnalyzedConnector,
     V1TableInfo,
   } from "../../../runtime-client";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import TableEntry from "./TableEntry.svelte";
   import { useInfiniteListTables } from "../selectors";
   import Button from "../../../components/button/Button.svelte";
   import type { ConnectorExplorerStore } from "./connector-explorer-store";
   import { onMount } from "svelte";
 
-  export let instanceId: string;
   export let connector: V1AnalyzedConnector;
   export let database: string;
   export let databaseSchema: string;
   export let store: ConnectorExplorerStore;
 
+  const client = useRuntimeClient();
+
   $: connectorName = connector?.name as string;
 
   $: expandedStore = store.getItem(connectorName, database, databaseSchema);
   $: expanded = $expandedStore;
 
   $: tablesQuery = useInfiniteListTables(
-    instanceId,
+    client.instanceId,
     connectorName,
     database,
     databaseSchema,
diff --git a/web-common/src/features/connectors/olap/TableInspector.svelte b/web-common/src/features/connectors/olap/TableInspector.svelte
index c7f6c94e7aa..2fa7214fdcf 100644
--- a/web-common/src/features/connectors/olap/TableInspector.svelte
+++ b/web-common/src/features/connectors/olap/TableInspector.svelte
@@ -8,8 +8,8 @@
   import {
     createQueryServiceTableCardinality,
     createQueryServiceTableColumns,
-  } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  } from "@rilldata/web-common/runtime-client/v2/gen";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { slide } from "svelte/transition";
 
   export let connector: string;
@@ -21,15 +21,17 @@
   let isReconciling = false;
   let hasUnsavedChanges = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
-  $: cardinalityQuery = createQueryServiceTableCardinality(instanceId, table, {
+  $: cardinalityQuery = createQueryServiceTableCardinality(client, {
+    tableName: table,
     connector,
     database,
     databaseSchema,
   });
 
-  $: profileColumnsQuery = createQueryServiceTableColumns(instanceId, table, {
+  $: profileColumnsQuery = createQueryServiceTableColumns(client, {
+    tableName: table,
     connector,
     database,
     databaseSchema,
diff --git a/web-common/src/features/models/inspector/References.svelte b/web-common/src/features/models/inspector/References.svelte
index 7c0b2f2bf31..3fa18246c65 100644
--- a/web-common/src/features/models/inspector/References.svelte
+++ b/web-common/src/features/models/inspector/References.svelte
@@ -4,29 +4,31 @@
   import CollapsibleSectionTitle from "@rilldata/web-common/layout/CollapsibleSectionTitle.svelte";
   import { LIST_SLIDE_DURATION } from "@rilldata/web-common/layout/config";
   import { formatCompactInteger } from "@rilldata/web-common/lib/formatters";
+  import type { V1ResourceName } from "@rilldata/web-common/runtime-client";
   import {
-    type V1ResourceName,
-    createQueryServiceTableCardinality,
     createRuntimeServiceGetResource,
-  } from "@rilldata/web-common/runtime-client";
+    createQueryServiceTableCardinality,
+  } from "@rilldata/web-common/runtime-client/v2/gen";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { derived } from "svelte/store";
   import { slide } from "svelte/transition";
-  import { runtime } from "../../../runtime-client/runtime-store";
   import { removeLeadingSlash } from "../../entity-management/entity-mappers";
   import WithModelResultTooltip from "./WithModelResultTooltip.svelte";
 
   export let refs: V1ResourceName[];
   export let modelHasError: boolean;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
   let showReferences = true;
 
   $: referencedResourcesStore = derived(
     refs.map((ref) => {
-      return createRuntimeServiceGetResource(instanceId, {
-        "name.name": ref.name as string,
-        "name.kind": ref.kind as string,
+      return createRuntimeServiceGetResource(client, {
+        name: {
+          name: ref.name as string,
+          kind: ref.kind as string,
+        },
       });
     }),
     (refs) => refs.map((ref) => ref.data),
@@ -35,18 +37,11 @@
 
   $: referencedResourceCardinalitiesStore = derived(
     refs.map((ref) => {
-      return createQueryServiceTableCardinality(
-        instanceId,
-        ref.name as string,
-        {},
-        {
-          query: {
-            select: (data) => +(data.cardinality ?? 0),
-          },
-        },
-      );
+      return createQueryServiceTableCardinality(client, {
+        tableName: ref.name as string,
+      });
     }),
-    (refs) => refs.map((ref) => ref.data),
+    (refs) => refs.map((ref) => Number(ref.data?.cardinality ?? 0)),
   );
   $: referencedResourcesCardinalities = $referencedResourceCardinalitiesStore;
 </script>

From 133a4112b24e22a749254544ac1e5d42079f15bd Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 14:47:44 +0300
Subject: [PATCH 14/27] refactor: migrate column-profile, canvas, and remaining
 connectors to v2 RuntimeClient

- column-profile/queries.ts: all functions accept RuntimeClient instead of instanceId
- connectors/selectors.ts: useListDatabaseSchemas, useInfiniteListTables, useGetTable
  accept RuntimeClient; useIsModelingSupported* functions left as-is (callers out of scope)
- Column profile components (NumericProfile, TimestampProfile, VarcharProfile,
  NestedProfile): replace $runtime with useRuntimeClient()
- WorkspaceInspector: replace $runtime with useRuntimeClient(), switch Orval hooks to v2
- Canvas components (CanvasInitialization, KPIProvider, PageEditor): replace $runtime
  with useRuntimeClient(), switch Orval hooks to v2
- Update already-migrated callers to pass client instead of client.instanceId
---
 .../canvas/CanvasInitialization.svelte        |  10 +-
 .../canvas/components/kpi/KPIProvider.svelte  |  28 ++---
 .../canvas/inspector/PageEditor.svelte        |  16 +--
 .../column-profile/ColumnProfile.svelte       |   2 +-
 .../column-types/NestedProfile.svelte         |  10 +-
 .../column-types/NumericProfile.svelte        |  24 ++--
 .../column-types/TimestampProfile.svelte      |   8 +-
 .../column-types/VarcharProfile.svelte        |  10 +-
 .../src/features/column-profile/queries.ts    | 103 +++++++++---------
 .../connectors/explorer/DatabaseEntry.svelte  |   2 +-
 .../explorer/DatabaseExplorer.svelte          |   2 +-
 .../explorer/DatabaseSchemaEntry.svelte       |   2 +-
 .../connectors/explorer/TableSchema.svelte    |   2 +-
 .../src/features/connectors/selectors.ts      |  98 ++++++++++-------
 .../inspector/WorkspaceInspector.svelte       |  36 +++---
 15 files changed, 186 insertions(+), 167 deletions(-)

diff --git a/web-common/src/features/canvas/CanvasInitialization.svelte b/web-common/src/features/canvas/CanvasInitialization.svelte
index 8be3de8d643..21fb9e3c1a9 100644
--- a/web-common/src/features/canvas/CanvasInitialization.svelte
+++ b/web-common/src/features/canvas/CanvasInitialization.svelte
@@ -13,10 +13,11 @@
   import { onNavigate } from "$app/navigation";
   import { writable } from "svelte/store";
   import {
-    createQueryServiceResolveCanvas,
     type V1MetricsView,
     type V1ResolveCanvasResponse,
   } from "@rilldata/web-common/runtime-client";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+  import { createQueryServiceResolveCanvas } from "@rilldata/web-common/runtime-client/v2/gen";
   import {
     ResourceKind,
     useResource,
@@ -30,6 +31,8 @@
   export let showBanner = false;
   export let projectId: string | undefined = undefined;
 
+  const client = useRuntimeClient();
+
   let resolvedStore: CanvasStore | undefined = undefined;
 
   $: ({ url } = $page);
@@ -45,9 +48,8 @@
 
   $: fetchedCanvasQuery = !existingStore
     ? createQueryServiceResolveCanvas(
-        instanceId,
-        canvasName,
-        {},
+        client,
+        { canvas: canvasName },
         {
           query: {
             retry: 5,
diff --git a/web-common/src/features/canvas/components/kpi/KPIProvider.svelte b/web-common/src/features/canvas/components/kpi/KPIProvider.svelte
index 96461e02066..0aae232c825 100644
--- a/web-common/src/features/canvas/components/kpi/KPIProvider.svelte
+++ b/web-common/src/features/canvas/components/kpi/KPIProvider.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import type { TimeAndFilterStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
   import { TIME_COMPARISON } from "@rilldata/web-common/lib/time/config";
+  import { V1TimeGrain } from "@rilldata/web-common/runtime-client";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import {
     createQueryServiceMetricsViewAggregation,
     createQueryServiceMetricsViewTimeSeries,
-    V1TimeGrain,
-  } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  } from "@rilldata/web-common/runtime-client/v2/gen";
   import { DateTime, Interval } from "luxon";
   import type { Readable } from "svelte/motion";
   import type { KPISpec } from ".";
@@ -19,13 +19,13 @@
   export let canvasName: string;
   export let visible: boolean;
 
-  $: ctx = getCanvasStore(canvasName, instanceId);
+  const client = useRuntimeClient();
+
+  $: ctx = getCanvasStore(canvasName, client.instanceId);
   $: ({
     metricsView: { getMeasureForMetricView },
   } = ctx.canvasEntity);
 
-  $: ({ instanceId } = $runtime);
-
   $: ({
     metrics_view: metricsViewName,
     measure: measureName,
@@ -62,9 +62,9 @@
   $: queryMeasures = [{ name: measureName }];
 
   $: totalQuery = createQueryServiceMetricsViewAggregation(
-    instanceId,
-    metricsViewName,
+    client,
     {
+      metricsView: metricsViewName,
       measures: queryMeasures,
       timeRange: {
         start,
@@ -82,9 +82,9 @@
   );
 
   $: comparisonTotalQuery = createQueryServiceMetricsViewAggregation(
-    instanceId,
-    metricsViewName,
+    client,
     {
+      metricsView: metricsViewName,
       measures: queryMeasures,
       timeRange: comparisonTimeRange,
       where,
@@ -104,9 +104,9 @@
   );
 
   $: primarySparklineQuery = createQueryServiceMetricsViewTimeSeries(
-    instanceId,
-    metricsViewName,
+    client,
     {
+      metricsViewName,
       measureNames: [measureName],
       timeStart: start,
       timeEnd: end,
@@ -123,9 +123,9 @@
   );
 
   $: comparisonSparklineQuery = createQueryServiceMetricsViewTimeSeries(
-    instanceId,
-    metricsViewName,
+    client,
     {
+      metricsViewName,
       measureNames: [measureName],
       timeStart: comparisonTimeRange?.start,
       timeEnd: comparisonTimeRange?.end,
diff --git a/web-common/src/features/canvas/inspector/PageEditor.svelte b/web-common/src/features/canvas/inspector/PageEditor.svelte
index da580a25adb..5f03fc3eabf 100644
--- a/web-common/src/features/canvas/inspector/PageEditor.svelte
+++ b/web-common/src/features/canvas/inspector/PageEditor.svelte
@@ -24,8 +24,8 @@
     DEFAULT_TIMEZONES,
   } from "@rilldata/web-common/lib/time/config";
   import { allTimeZones } from "@rilldata/web-common/lib/time/timezone";
-  import { createRuntimeServiceGetInstance } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+  import { createRuntimeServiceGetInstance } from "@rilldata/web-common/runtime-client/v2/gen";
   import { YAMLMap, YAMLSeq } from "yaml";
   import { DEFAULT_DASHBOARD_WIDTH } from "../layout-util";
 
@@ -41,11 +41,11 @@
   export let fileArtifact: FileArtifact;
   export let canvasName: string;
 
+  const client = useRuntimeClient();
+
   $: ({
     canvasEntity: { filtersEnabledStore, _embeddedTheme },
-  } = getCanvasStore(canvasName, instanceId));
-
-  $: ({ instanceId } = $runtime);
+  } = getCanvasStore(canvasName, client.instanceId));
 
   $: parsedDocument = getParsedDocument(fileArtifact);
 
@@ -87,15 +87,15 @@
 
   $: title = stringGuard(rawTitle) || stringGuard(rawDisplayName);
 
-  $: themesQuery = useFilteredResources(instanceId, ResourceKind.Theme);
+  $: themesQuery = useFilteredResources(client.instanceId, ResourceKind.Theme);
 
   $: themeNames = ($themesQuery?.data ?? [])
     .map((theme) => theme.meta?.name?.name ?? "")
     .filter((string) => !string.endsWith("--theme"));
 
   $: defaultThemeQuery = createRuntimeServiceGetInstance(
-    instanceId,
-    undefined,
+    client,
+    {},
     {
       query: {
         select: (data) => data?.instance?.theme,
diff --git a/web-common/src/features/column-profile/ColumnProfile.svelte b/web-common/src/features/column-profile/ColumnProfile.svelte
index ef9421577f1..3ccdb28a7ab 100644
--- a/web-common/src/features/column-profile/ColumnProfile.svelte
+++ b/web-common/src/features/column-profile/ColumnProfile.svelte
@@ -52,7 +52,7 @@
   });
 
   $: nestedColumnProfileQuery = getSummaries(
-    client.instanceId,
+    client,
     connector,
     database,
     databaseSchema,
diff --git a/web-common/src/features/column-profile/column-types/NestedProfile.svelte b/web-common/src/features/column-profile/column-types/NestedProfile.svelte
index 0927006bbdb..15f91eacf02 100644
--- a/web-common/src/features/column-profile/column-types/NestedProfile.svelte
+++ b/web-common/src/features/column-profile/column-types/NestedProfile.svelte
@@ -5,7 +5,7 @@
     INTERVALS,
   } from "@rilldata/web-common/lib/duckdb-data-types";
   import { httpRequestQueue } from "../../../runtime-client/http-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import ColumnProfileIcon from "../ColumnProfileIcon.svelte";
   import ProfileContainer from "../ProfileContainer.svelte";
   import {
@@ -37,10 +37,10 @@
 
   let active = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
   $: nulls = getNullPercentage(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -50,7 +50,7 @@
   );
 
   $: columnCardinality = getCountDistinct(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -60,7 +60,7 @@
   );
 
   $: topK = getTopK(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
diff --git a/web-common/src/features/column-profile/column-types/NumericProfile.svelte b/web-common/src/features/column-profile/column-types/NumericProfile.svelte
index 782f4abb73d..9c754a32a33 100644
--- a/web-common/src/features/column-profile/column-types/NumericProfile.svelte
+++ b/web-common/src/features/column-profile/column-types/NumericProfile.svelte
@@ -5,15 +5,15 @@
     INTERVALS,
     isFloat,
   } from "@rilldata/web-common/lib/duckdb-data-types";
+  import { QueryServiceColumnNumericHistogramHistogramMethod } from "@rilldata/web-common/runtime-client";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import {
-    QueryServiceColumnNumericHistogramHistogramMethod,
     createQueryServiceColumnDescriptiveStatistics,
     createQueryServiceColumnRugHistogram,
-  } from "@rilldata/web-common/runtime-client";
+  } from "@rilldata/web-common/runtime-client/v2/gen";
   import { getPriorityForColumn } from "@rilldata/web-common/runtime-client/http-request-queue/priorities";
   import { derived } from "svelte/store";
   import { httpRequestQueue } from "../../../runtime-client/http-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
   import ColumnProfileIcon from "../ColumnProfileIcon.svelte";
   import ProfileContainer from "../ProfileContainer.svelte";
   import {
@@ -43,10 +43,10 @@
 
   let active = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
   $: nulls = getNullPercentage(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -56,7 +56,7 @@
   );
 
   $: diagnosticHistogram = getNumericHistogram(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -69,7 +69,7 @@
   let fdHistogram;
   $: if (isFloat(type)) {
     fdHistogram = getNumericHistogram(
-      instanceId,
+      client,
       connector,
       database,
       databaseSchema,
@@ -95,9 +95,9 @@
     : $diagnosticHistogram?.data;
 
   $: rug = createQueryServiceColumnRugHistogram(
-    instanceId,
-    objectName,
+    client,
     {
+      tableName: objectName,
       connector,
       database,
       databaseSchema,
@@ -114,7 +114,7 @@
     },
   );
   $: topK = getTopK(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -125,9 +125,9 @@
 
   $: summary = derived(
     createQueryServiceColumnDescriptiveStatistics(
-      instanceId,
-      objectName,
+      client,
       {
+        tableName: objectName,
         connector,
         database,
         databaseSchema,
diff --git a/web-common/src/features/column-profile/column-types/TimestampProfile.svelte b/web-common/src/features/column-profile/column-types/TimestampProfile.svelte
index b4918952549..e9ca292ebac 100644
--- a/web-common/src/features/column-profile/column-types/TimestampProfile.svelte
+++ b/web-common/src/features/column-profile/column-types/TimestampProfile.svelte
@@ -5,7 +5,7 @@
   import { copyToClipboard } from "@rilldata/web-common/lib/actions/copy-to-clipboard";
   import { TIMESTAMP_TOKENS } from "@rilldata/web-common/lib/duckdb-data-types";
   import { httpRequestQueue } from "../../../runtime-client/http-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import ColumnProfileIcon from "../ColumnProfileIcon.svelte";
   import ProfileContainer from "../ProfileContainer.svelte";
   import {
@@ -28,14 +28,14 @@
   export let hideNullPercentage = false;
   export let enableProfiling = true;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
   let timestampDetailHeight = 160;
   let active = false;
 
   /** queries used to power the different plots */
   $: nullPercentage = getNullPercentage(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -45,7 +45,7 @@
   );
 
   $: timeSeries = getTimeSeriesAndSpark(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
diff --git a/web-common/src/features/column-profile/column-types/VarcharProfile.svelte b/web-common/src/features/column-profile/column-types/VarcharProfile.svelte
index c4ee7004195..ebffe9e37f2 100644
--- a/web-common/src/features/column-profile/column-types/VarcharProfile.svelte
+++ b/web-common/src/features/column-profile/column-types/VarcharProfile.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { copyToClipboard } from "@rilldata/web-common/lib/actions/copy-to-clipboard";
   import { httpRequestQueue } from "../../../runtime-client/http-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import ColumnProfileIcon from "../ColumnProfileIcon.svelte";
   import ProfileContainer from "../ProfileContainer.svelte";
   import {
@@ -30,10 +30,10 @@
   let active = false;
   let topKLimit = 15;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
 
   $: nulls = getNullPercentage(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -43,7 +43,7 @@
   );
 
   $: columnCardinality = getCountDistinct(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -53,7 +53,7 @@
   );
 
   $: topK = getTopK(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
diff --git a/web-common/src/features/column-profile/queries.ts b/web-common/src/features/column-profile/queries.ts
index c004e29624a..95115ea3b89 100644
--- a/web-common/src/features/column-profile/queries.ts
+++ b/web-common/src/features/column-profile/queries.ts
@@ -1,4 +1,10 @@
 import { convertTimestampPreview } from "@rilldata/web-common/lib/convertTimestampPreview";
+import {
+  QueryServiceColumnNumericHistogramHistogramMethod,
+  type V1ProfileColumn,
+  type V1TableColumnsResponse,
+} from "@rilldata/web-common/runtime-client";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import {
   createQueryServiceColumnCardinality,
   createQueryServiceColumnNullCount,
@@ -8,10 +14,7 @@ import {
   createQueryServiceColumnTimeSeries,
   createQueryServiceColumnTopK,
   createQueryServiceTableCardinality,
-  QueryServiceColumnNumericHistogramHistogramMethod,
-  type V1ProfileColumn,
-  type V1TableColumnsResponse,
-} from "@rilldata/web-common/runtime-client";
+} from "@rilldata/web-common/runtime-client/v2/gen";
 import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
 import { getPriorityForColumn } from "@rilldata/web-common/runtime-client/http-request-queue/priorities";
 import {
@@ -32,7 +35,7 @@ export type ColumnSummary = V1ProfileColumn & {
 
 /** for each entry in a profile column results, return the null count and the column cardinality */
 export function getSummaries(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database: string,
   databaseSchema: string,
@@ -45,9 +48,9 @@ export function getSummaries(
         [
           writable(column),
           createQueryServiceColumnNullCount(
-            instanceId,
-            objectName,
+            client,
             {
+              tableName: objectName,
               connector,
               database,
               databaseSchema,
@@ -61,9 +64,9 @@ export function getSummaries(
             },
           ),
           createQueryServiceColumnCardinality(
-            instanceId,
-            objectName,
+            client,
             {
+              tableName: objectName,
               connector,
               database,
               databaseSchema,
@@ -98,7 +101,7 @@ export function getSummaries(
 }
 
 export function getNullPercentage(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database: string,
   databaseSchema: string,
@@ -107,9 +110,9 @@ export function getNullPercentage(
   enabled = true,
 ) {
   const nullQuery = createQueryServiceColumnNullCount(
-    instanceId,
-    objectName,
+    client,
     {
+      tableName: objectName,
       connector,
       database,
       databaseSchema,
@@ -122,9 +125,9 @@ export function getNullPercentage(
     },
   );
   const totalRowsQuery = createQueryServiceTableCardinality(
-    instanceId,
-    objectName,
+    client,
     {
+      tableName: objectName,
       connector,
       database,
       databaseSchema,
@@ -149,7 +152,7 @@ export function getNullPercentage(
 }
 
 export function getCountDistinct(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database: string,
   databaseSchema: string,
@@ -158,9 +161,8 @@ export function getCountDistinct(
   enabled = true,
 ) {
   const cardinalityQuery = createQueryServiceColumnCardinality(
-    instanceId,
-    objectName,
-    { connector, database, databaseSchema, columnName },
+    client,
+    { tableName: objectName, connector, database, databaseSchema, columnName },
     {
       query: {
         enabled,
@@ -169,9 +171,8 @@ export function getCountDistinct(
   );
 
   const totalRowsQuery = createQueryServiceTableCardinality(
-    instanceId,
-    objectName,
-    { connector, database, databaseSchema },
+    client,
+    { tableName: objectName, connector, database, databaseSchema },
     {
       query: {
         enabled,
@@ -196,7 +197,7 @@ export function getCountDistinct(
 }
 
 export function getTopK(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database: string,
   databaseSchema: string,
@@ -206,9 +207,9 @@ export function getTopK(
   active = false,
 ) {
   const topKQuery = createQueryServiceColumnTopK(
-    instanceId,
-    objectName,
+    client,
     {
+      tableName: objectName,
       connector,
       database,
       databaseSchema,
@@ -229,7 +230,7 @@ export function getTopK(
 }
 
 export function getTimeSeriesAndSpark(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database: string,
   databaseSchema: string,
@@ -239,10 +240,9 @@ export function getTimeSeriesAndSpark(
   active = false,
 ) {
   const query = createQueryServiceColumnTimeSeries(
-    instanceId,
-    objectName,
-    // FIXME: convert pixel back to number once the API
+    client,
     {
+      tableName: objectName,
       connector,
       database,
       databaseSchema,
@@ -260,9 +260,9 @@ export function getTimeSeriesAndSpark(
     },
   );
   const estimatedInterval = createQueryServiceColumnRollupInterval(
-    instanceId,
-    objectName,
+    client,
     {
+      tableName: objectName,
       connector,
       database,
       databaseSchema,
@@ -277,9 +277,9 @@ export function getTimeSeriesAndSpark(
   );
 
   const smallestTimeGrain = createQueryServiceColumnTimeGrain(
-    instanceId,
-    objectName,
+    client,
     {
+      tableName: objectName,
       connector,
       database,
       databaseSchema,
@@ -324,7 +324,7 @@ export function getTimeSeriesAndSpark(
 }
 
 export function getNumericHistogram(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database: string,
   databaseSchema: string,
@@ -334,24 +334,27 @@ export function getNumericHistogram(
   enabled = true,
   active = false,
 ) {
-  return createQueryServiceColumnNumericHistogram(
-    instanceId,
-    objectName,
-    {
-      connector,
-      database,
-      databaseSchema,
-      columnName,
-      histogramMethod,
-      priority: getPriorityForColumn("numeric-histogram", active),
-    },
-    {
-      query: {
-        select(query) {
-          return query?.numericSummary?.numericHistogramBins?.bins;
+  return derived(
+    createQueryServiceColumnNumericHistogram(
+      client,
+      {
+        tableName: objectName,
+        connector,
+        database,
+        databaseSchema,
+        columnName,
+        histogramMethod,
+        priority: getPriorityForColumn("numeric-histogram", active),
+      },
+      {
+        query: {
+          enabled,
         },
-        enabled,
       },
-    },
+    ),
+    ($query) => ({
+      data: $query?.data?.numericSummary?.numericHistogramBins?.bins,
+      isFetching: $query?.isFetching,
+    }),
   );
 }
diff --git a/web-common/src/features/connectors/explorer/DatabaseEntry.svelte b/web-common/src/features/connectors/explorer/DatabaseEntry.svelte
index 41c5fc0807e..e3b277492c0 100644
--- a/web-common/src/features/connectors/explorer/DatabaseEntry.svelte
+++ b/web-common/src/features/connectors/explorer/DatabaseEntry.svelte
@@ -20,7 +20,7 @@
   $: expanded = $expandedStore;
 
   $: databaseSchemasQuery = useListDatabaseSchemas(
-    client.instanceId,
+    client,
     connectorName,
     database,
   );
diff --git a/web-common/src/features/connectors/explorer/DatabaseExplorer.svelte b/web-common/src/features/connectors/explorer/DatabaseExplorer.svelte
index 75d6fe4cdb4..1f53b2c9108 100644
--- a/web-common/src/features/connectors/explorer/DatabaseExplorer.svelte
+++ b/web-common/src/features/connectors/explorer/DatabaseExplorer.svelte
@@ -18,7 +18,7 @@
   $: queryEnabled = !hasError;
 
   $: databaseSchemasQuery = useListDatabaseSchemas(
-    client.instanceId,
+    client,
     connectorName,
     undefined,
     queryEnabled,
diff --git a/web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte b/web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte
index 3caf4639953..d3996e2b3fb 100644
--- a/web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte
+++ b/web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte
@@ -25,7 +25,7 @@
   $: expanded = $expandedStore;
 
   $: tablesQuery = useInfiniteListTables(
-    client.instanceId,
+    client,
     connectorName,
     database,
     databaseSchema,
diff --git a/web-common/src/features/connectors/explorer/TableSchema.svelte b/web-common/src/features/connectors/explorer/TableSchema.svelte
index 673c3fdb9d1..4dac3cbe492 100644
--- a/web-common/src/features/connectors/explorer/TableSchema.svelte
+++ b/web-common/src/features/connectors/explorer/TableSchema.svelte
@@ -12,7 +12,7 @@
   const client = useRuntimeClient();
 
   $: newTableQuery = useGetTable(
-    client.instanceId,
+    client,
     connector,
     database,
     databaseSchema,
diff --git a/web-common/src/features/connectors/selectors.ts b/web-common/src/features/connectors/selectors.ts
index ae0aaeed023..228f2dd4434 100644
--- a/web-common/src/features/connectors/selectors.ts
+++ b/web-common/src/features/connectors/selectors.ts
@@ -3,15 +3,18 @@ import { createInfiniteQuery } from "@tanstack/svelte-query";
 import { derived } from "svelte/store";
 import {
   type V1TableInfo,
-  createConnectorServiceListDatabaseSchemas,
-  createConnectorServiceGetTable,
   createRuntimeServiceGetInstance,
   type V1GetResourceResponse,
   getRuntimeServiceGetResourceQueryKey,
   runtimeServiceGetResource,
   type RpcStatus,
 } from "../../runtime-client";
-import { connectorServiceListTables } from "../../runtime-client/gen/connector-service/connector-service";
+import type { RuntimeClient } from "../../runtime-client/v2";
+import {
+  createConnectorServiceListDatabaseSchemas,
+  createConnectorServiceGetTable,
+  connectorServiceListTables,
+} from "../../runtime-client/v2/gen";
 import { ResourceKind } from "../entity-management/resource-selectors";
 import type { ErrorType } from "@rilldata/web-common/runtime-client/http-client";
 
@@ -104,55 +107,62 @@ export function useIsModelingSupportedForDefaultOlapDriverOLAP(
  * The backend returns all schemas across databases; filtering is applied client-side.
  */
 export function useListDatabaseSchemas(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database?: string,
   enabled: boolean = true,
 ) {
-  return createConnectorServiceListDatabaseSchemas(
+  const query = createConnectorServiceListDatabaseSchemas(
+    client,
     {
-      instanceId,
       connector,
     },
     {
       query: {
-        enabled: !!instanceId && !!connector && enabled,
-        select: (data) => {
-          const allSchemas = data.databaseSchemas ?? [];
-
-          if (database !== undefined) {
-            const hasEmptyDatabases = allSchemas.every((s) => !s.database);
-            return hasEmptyDatabases
-              ? [database]
-              : allSchemas
-                  .filter((s) => s.database === database)
-                  .map((s) => s.databaseSchema ?? "");
-          }
-
-          // Derive databases (top-level)
-          const hasEmptyDatabases = allSchemas.every(
-            (schema) => !schema.database,
-          );
-          return hasEmptyDatabases
-            ? Array.from(
-                new Set(
-                  allSchemas.map((schema) => schema.databaseSchema ?? ""),
-                ),
-              )
-            : Array.from(
-                new Set(allSchemas.map((schema) => schema.database ?? "")),
-              ).filter(Boolean);
-        },
+        enabled: !!client.instanceId && !!connector && enabled,
       },
     },
   );
+
+  return derived(query, ($q) => {
+    const allSchemas = $q?.data?.databaseSchemas ?? [];
+
+    let data: string[] | undefined;
+    if ($q?.data) {
+      if (database !== undefined) {
+        const hasEmptyDatabases = allSchemas.every((s) => !s.database);
+        data = hasEmptyDatabases
+          ? [database]
+          : allSchemas
+              .filter((s) => s.database === database)
+              .map((s) => s.databaseSchema ?? "");
+      } else {
+        const hasEmptyDatabases = allSchemas.every(
+          (schema) => !schema.database,
+        );
+        data = hasEmptyDatabases
+          ? Array.from(
+              new Set(allSchemas.map((schema) => schema.databaseSchema ?? "")),
+            )
+          : Array.from(
+              new Set(allSchemas.map((schema) => schema.database ?? "")),
+            ).filter(Boolean);
+      }
+    }
+
+    return {
+      data,
+      error: $q?.error,
+      isLoading: $q?.isLoading,
+    };
+  });
 }
 
 /**
  * Infinite tables loader using pageToken cursor
  */
 export function useInfiniteListTables(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database: string,
   databaseSchema: string,
@@ -162,11 +172,17 @@ export function useInfiniteListTables(
   return createInfiniteQuery({
     queryKey: [
       "/v1/connectors/tables",
-      { instanceId, connector, database, databaseSchema, pageSize },
+      {
+        instanceId: client.instanceId,
+        connector,
+        database,
+        databaseSchema,
+        pageSize,
+      },
     ],
     enabled:
       enabled &&
-      !!instanceId &&
+      !!client.instanceId &&
       !!connector &&
       (!!database || database === "") &&
       databaseSchema !== undefined,
@@ -175,15 +191,15 @@ export function useInfiniteListTables(
       lastPage?.nextPageToken || undefined,
     queryFn: ({ pageParam, signal }) =>
       connectorServiceListTables(
+        client,
         {
-          instanceId,
           connector,
           database,
           databaseSchema,
           pageSize,
           pageToken: pageParam,
         },
-        signal,
+        { signal },
       ),
     select: (data: any) => ({
       tables: data.pages.flatMap(
@@ -202,15 +218,15 @@ export function useInfiniteListTables(
  * Called when a table is selected/expanded
  */
 export function useGetTable(
-  instanceId: string,
+  client: RuntimeClient,
   connector: string,
   database: string,
   databaseSchema: string,
   table: string,
 ) {
   return createConnectorServiceGetTable(
+    client,
     {
-      instanceId,
       connector,
       database,
       databaseSchema,
@@ -219,7 +235,7 @@ export function useGetTable(
     {
       query: {
         enabled:
-          !!instanceId &&
+          !!client.instanceId &&
           !!connector &&
           !!table &&
           database !== undefined &&
diff --git a/web-common/src/features/models/inspector/WorkspaceInspector.svelte b/web-common/src/features/models/inspector/WorkspaceInspector.svelte
index 68562a9474a..b1830c29d36 100644
--- a/web-common/src/features/models/inspector/WorkspaceInspector.svelte
+++ b/web-common/src/features/models/inspector/WorkspaceInspector.svelte
@@ -15,17 +15,17 @@
     formatBigNumberPercentage,
     formatInteger,
   } from "@rilldata/web-common/lib/formatters";
+  import type { V1Resource } from "@rilldata/web-common/runtime-client";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import {
-    type V1Resource,
     createQueryServiceTableCardinality,
     createQueryServiceTableColumns,
-  } from "@rilldata/web-common/runtime-client";
+  } from "@rilldata/web-common/runtime-client/v2/gen";
   import { keepPreviousData } from "@tanstack/svelte-query";
   import { derived } from "svelte/store";
   import { slide } from "svelte/transition";
   import { LIST_SLIDE_DURATION } from "../../../layout/config";
   import InspectorHeaderGrid from "../../../layout/inspector/InspectorHeaderGrid.svelte";
-  import { runtime } from "../../../runtime-client/runtime-store";
   import IncrementalProcessing from "../incremental/IncrementalProcessing.svelte";
   import PartitionsBrowser from "../partitions/PartitionsBrowser.svelte";
   import References from "./References.svelte";
@@ -44,27 +44,25 @@
 
   let showColumns = true;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+
   $: source = resource?.source;
   $: model = resource?.model;
 
   $: connectorType = source && formatConnectorType(source);
   $: fileExtension = source && getFileExtension(source);
 
-  $: cardinalityQuery = createQueryServiceTableCardinality(
-    instanceId,
+  $: cardinalityQuery = createQueryServiceTableCardinality(client, {
     tableName,
-    {
-      connector,
-      database,
-      databaseSchema,
-    },
-  );
+    connector,
+    database,
+    databaseSchema,
+  });
 
   $: profileColumnsQuery = createQueryServiceTableColumns(
-    instanceId,
-    tableName,
+    client,
     {
+      tableName,
       connector,
       database,
       databaseSchema,
@@ -88,7 +86,7 @@
   $: columnCount = `${formatInteger(profileColumnsCount)} columns`;
 
   $: summaries = getSummaries(
-    instanceId,
+    client,
     connector,
     database,
     databaseSchema,
@@ -112,9 +110,9 @@
 
   $: cardinalityQueries = resourceRefs.map((ref) => {
     return createQueryServiceTableCardinality(
-      instanceId,
-      ref.name as string,
+      client,
       {
+        tableName: ref.name as string,
         connector,
         database,
         databaseSchema,
@@ -130,9 +128,9 @@
   $: sourceProfileColumns =
     resourceRefs.map((ref) => {
       return createQueryServiceTableColumns(
-        instanceId,
-        ref.name as string,
+        client,
         {
+          tableName: ref.name as string,
           connector,
           database,
           databaseSchema,

From fafeda1defaaf04076030fe18aeb645a4a28b084 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 14:55:19 +0300
Subject: [PATCH 15/27] fix: restore select transforms now that v2 hooks
 support generic TData

Reverts the derived-store workarounds in queries.ts and selectors.ts,
using select transforms directly as the v2 code generator now supports
generic TData inference.
---
 .../src/features/column-profile/queries.ts    | 37 ++++++-----
 .../src/features/connectors/selectors.ts      | 61 ++++++++-----------
 2 files changed, 44 insertions(+), 54 deletions(-)

diff --git a/web-common/src/features/column-profile/queries.ts b/web-common/src/features/column-profile/queries.ts
index 95115ea3b89..aab98d3c481 100644
--- a/web-common/src/features/column-profile/queries.ts
+++ b/web-common/src/features/column-profile/queries.ts
@@ -334,27 +334,24 @@ export function getNumericHistogram(
   enabled = true,
   active = false,
 ) {
-  return derived(
-    createQueryServiceColumnNumericHistogram(
-      client,
-      {
-        tableName: objectName,
-        connector,
-        database,
-        databaseSchema,
-        columnName,
-        histogramMethod,
-        priority: getPriorityForColumn("numeric-histogram", active),
-      },
-      {
-        query: {
-          enabled,
+  return createQueryServiceColumnNumericHistogram(
+    client,
+    {
+      tableName: objectName,
+      connector,
+      database,
+      databaseSchema,
+      columnName,
+      histogramMethod,
+      priority: getPriorityForColumn("numeric-histogram", active),
+    },
+    {
+      query: {
+        select(query) {
+          return query?.numericSummary?.numericHistogramBins?.bins;
         },
+        enabled,
       },
-    ),
-    ($query) => ({
-      data: $query?.data?.numericSummary?.numericHistogramBins?.bins,
-      isFetching: $query?.isFetching,
-    }),
+    },
   );
 }
diff --git a/web-common/src/features/connectors/selectors.ts b/web-common/src/features/connectors/selectors.ts
index 228f2dd4434..c35aee26612 100644
--- a/web-common/src/features/connectors/selectors.ts
+++ b/web-common/src/features/connectors/selectors.ts
@@ -112,7 +112,7 @@ export function useListDatabaseSchemas(
   database?: string,
   enabled: boolean = true,
 ) {
-  const query = createConnectorServiceListDatabaseSchemas(
+  return createConnectorServiceListDatabaseSchemas(
     client,
     {
       connector,
@@ -120,42 +120,35 @@ export function useListDatabaseSchemas(
     {
       query: {
         enabled: !!client.instanceId && !!connector && enabled,
+        select: (data) => {
+          const allSchemas = data.databaseSchemas ?? [];
+
+          if (database !== undefined) {
+            const hasEmptyDatabases = allSchemas.every((s) => !s.database);
+            return hasEmptyDatabases
+              ? [database]
+              : allSchemas
+                  .filter((s) => s.database === database)
+                  .map((s) => s.databaseSchema ?? "");
+          }
+
+          // Derive databases (top-level)
+          const hasEmptyDatabases = allSchemas.every(
+            (schema) => !schema.database,
+          );
+          return hasEmptyDatabases
+            ? Array.from(
+                new Set(
+                  allSchemas.map((schema) => schema.databaseSchema ?? ""),
+                ),
+              )
+            : Array.from(
+                new Set(allSchemas.map((schema) => schema.database ?? "")),
+              ).filter(Boolean);
+        },
       },
     },
   );
-
-  return derived(query, ($q) => {
-    const allSchemas = $q?.data?.databaseSchemas ?? [];
-
-    let data: string[] | undefined;
-    if ($q?.data) {
-      if (database !== undefined) {
-        const hasEmptyDatabases = allSchemas.every((s) => !s.database);
-        data = hasEmptyDatabases
-          ? [database]
-          : allSchemas
-              .filter((s) => s.database === database)
-              .map((s) => s.databaseSchema ?? "");
-      } else {
-        const hasEmptyDatabases = allSchemas.every(
-          (schema) => !schema.database,
-        );
-        data = hasEmptyDatabases
-          ? Array.from(
-              new Set(allSchemas.map((schema) => schema.databaseSchema ?? "")),
-            )
-          : Array.from(
-              new Set(allSchemas.map((schema) => schema.database ?? "")),
-            ).filter(Boolean);
-      }
-    }
-
-    return {
-      data,
-      error: $q?.error,
-      isLoading: $q?.isLoading,
-    };
-  });
 }
 
 /**

From 46ae340707ca15a06a65f4260055213c0fb66681 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 16:29:50 +0300
Subject: [PATCH 16/27] refactor: migrate chart providers and canvas leaf
 components to v2 RuntimeClient

Chart providers (batch 1): all 6 providers now accept RuntimeClient
instead of Writable<Runtime>, use v2 query hooks, and remove runtime
from derived store inputs since the client is a stable object.

Canvas leaf components (batch 2): 13 Svelte components migrated from
$runtime store to useRuntimeClient() context. CanvasStore extended
with runtimeClient field to bridge chart providers in canvas context.
---
 .../canvas/CanvasDashboardWrapper.svelte      |  6 ++-
 .../canvas/CanvasInitialization.svelte        |  2 +-
 .../features/canvas/CanvasMenuItems.svelte    |  6 ++-
 .../features/canvas/CanvasPreviewCTAs.svelte  |  6 ++-
 .../charts/variants/CartesianChart.ts         |  5 ++-
 .../charts/variants/CircularChart.ts          |  5 ++-
 .../components/charts/variants/ComboChart.ts  |  5 ++-
 .../components/charts/variants/FunnelChart.ts |  5 ++-
 .../charts/variants/HeatmapChart.ts           |  5 ++-
 .../charts/variants/ScatterPlotChart.ts       |  5 ++-
 .../canvas/components/image/Image.svelte      |  6 ++-
 .../canvas/explore-link/ExploreLink.svelte    |  6 ++-
 .../inspector/MetricSelectorDropdown.svelte   |  6 ++-
 .../inspector/chart/MarkSelector.svelte       |  6 ++-
 .../chart/PositionalFieldConfig.svelte        |  7 +--
 .../field-config/ColorRangeSelector.svelte    |  7 +--
 .../fields/FieldSelectorDropdown.svelte       |  8 ++--
 .../inspector/fields/MultiFieldInput.svelte   |  7 +--
 .../fields/MultiPositionalFieldsInput.svelte  |  7 +--
 .../inspector/fields/SingleFieldInput.svelte  |  8 ++--
 .../canvas/state-managers/state-managers.ts   |  4 ++
 .../components/charts/ChartContainer.svelte   | 10 +++--
 .../cartesian/CartesianChartProvider.ts       | 43 +++++++++----------
 .../charts/circular/CircularChartProvider.ts  | 41 +++++++++---------
 .../charts/combo/ComboChartProvider.ts        | 33 +++++++-------
 .../charts/funnel/FunnelChartProvider.ts      | 33 +++++++-------
 .../charts/heatmap/HeatmapChartProvider.ts    | 39 ++++++++---------
 .../scatter/ScatterPlotChartProvider.ts       | 30 ++++++-------
 .../src/features/components/charts/types.ts   |  5 +--
 29 files changed, 196 insertions(+), 160 deletions(-)

diff --git a/web-common/src/features/canvas/CanvasDashboardWrapper.svelte b/web-common/src/features/canvas/CanvasDashboardWrapper.svelte
index b370455dd9c..5415d6c82f8 100644
--- a/web-common/src/features/canvas/CanvasDashboardWrapper.svelte
+++ b/web-common/src/features/canvas/CanvasDashboardWrapper.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
   import { dynamicHeight } from "@rilldata/web-common/layout/layout-settings.ts";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import CellInspector from "@rilldata/web-common/components/CellInspector.svelte";
   import CanvasFilters from "./filters/CanvasFilters.svelte";
   import { getCanvasStore } from "./state-managers/state-managers";
   import ThemeProvider from "../dashboards/ThemeProvider.svelte";
 
+  const client = useRuntimeClient();
+
   export let maxWidth: number;
   export let clientWidth = 0;
   export let showGrabCursor = false;
@@ -17,7 +19,7 @@
 
   let contentRect = new DOMRectReadOnly(0, 0, 0, 0);
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = client);
 
   $: ({
     canvasEntity: { theme },
diff --git a/web-common/src/features/canvas/CanvasInitialization.svelte b/web-common/src/features/canvas/CanvasInitialization.svelte
index 21fb9e3c1a9..85ddc90433a 100644
--- a/web-common/src/features/canvas/CanvasInitialization.svelte
+++ b/web-common/src/features/canvas/CanvasInitialization.svelte
@@ -170,7 +170,7 @@
           filePath: fetchedCanvas?.canvas?.meta?.filePaths?.[0],
         };
 
-        return setCanvasStore(canvasName, instanceId, processed);
+        return setCanvasStore(canvasName, instanceId, processed, client);
       }
     }
 
diff --git a/web-common/src/features/canvas/CanvasMenuItems.svelte b/web-common/src/features/canvas/CanvasMenuItems.svelte
index 4fa80163a20..557ba48870d 100644
--- a/web-common/src/features/canvas/CanvasMenuItems.svelte
+++ b/web-common/src/features/canvas/CanvasMenuItems.svelte
@@ -1,18 +1,20 @@
 <script lang="ts">
   import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts";
   import NavigationMenuItem from "@rilldata/web-common/layout/navigation/NavigationMenuItem.svelte";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useQueryClient } from "@tanstack/svelte-query";
   import { GitBranch } from "lucide-svelte";
   import { openResourceGraphQuickView } from "@rilldata/web-common/features/resource-graph/quick-view/quick-view-store";
 
+  const client = useRuntimeClient();
+
   export let filePath: string;
 
   $: fileArtifact = fileArtifacts.getFileArtifact(filePath);
 
   const queryClient = useQueryClient();
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = client);
 
   $: canvasQuery = fileArtifact.getResource(queryClient, instanceId);
   $: canvasResource = $canvasQuery.data;
diff --git a/web-common/src/features/canvas/CanvasPreviewCTAs.svelte b/web-common/src/features/canvas/CanvasPreviewCTAs.svelte
index 882756a7f35..f944646a4b2 100644
--- a/web-common/src/features/canvas/CanvasPreviewCTAs.svelte
+++ b/web-common/src/features/canvas/CanvasPreviewCTAs.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import { useCanvas } from "@rilldata/web-common/features/canvas/selector";
   import { Button } from "../../components/button";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import { featureFlags } from "../feature-flags";
   import ChatToggle from "@rilldata/web-common/features/chat/layouts/sidebar/ChatToggle.svelte";
 
+  const client = useRuntimeClient();
+
   export let canvasName: string;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = client);
 
   $: canvasQuery = useCanvas(instanceId, canvasName);
   $: canvasFilePath = $canvasQuery.data?.filePath ?? "";
diff --git a/web-common/src/features/canvas/components/charts/variants/CartesianChart.ts b/web-common/src/features/canvas/components/charts/variants/CartesianChart.ts
index 9a0ddd54305..7f1fb56d0b9 100644
--- a/web-common/src/features/canvas/components/charts/variants/CartesianChart.ts
+++ b/web-common/src/features/canvas/components/charts/variants/CartesianChart.ts
@@ -206,7 +206,10 @@ export class CartesianChartComponent extends BaseChart<CartesianCanvasChartSpec>
     ctx: CanvasStore,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
-    return this.provider.createChartDataQuery(ctx.runtime, timeAndFilterStore);
+    return this.provider.createChartDataQuery(
+      ctx.runtimeClient,
+      timeAndFilterStore,
+    );
   }
 
   static newComponentSpec(
diff --git a/web-common/src/features/canvas/components/charts/variants/CircularChart.ts b/web-common/src/features/canvas/components/charts/variants/CircularChart.ts
index cf4d3dbc9cb..5878041e83b 100644
--- a/web-common/src/features/canvas/components/charts/variants/CircularChart.ts
+++ b/web-common/src/features/canvas/components/charts/variants/CircularChart.ts
@@ -100,7 +100,10 @@ export class CircularChartComponent extends BaseChart<CircularCanvasChartSpec> {
     ctx: CanvasStore,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
-    return this.provider.createChartDataQuery(ctx.runtime, timeAndFilterStore);
+    return this.provider.createChartDataQuery(
+      ctx.runtimeClient,
+      timeAndFilterStore,
+    );
   }
 
   getChartDomainValues() {
diff --git a/web-common/src/features/canvas/components/charts/variants/ComboChart.ts b/web-common/src/features/canvas/components/charts/variants/ComboChart.ts
index a5e661d858b..cca053795d4 100644
--- a/web-common/src/features/canvas/components/charts/variants/ComboChart.ts
+++ b/web-common/src/features/canvas/components/charts/variants/ComboChart.ts
@@ -184,7 +184,10 @@ export class ComboChartComponent extends BaseChart<ComboCanvasChartSpec> {
     ctx: CanvasStore,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
-    return this.provider.createChartDataQuery(ctx.runtime, timeAndFilterStore);
+    return this.provider.createChartDataQuery(
+      ctx.runtimeClient,
+      timeAndFilterStore,
+    );
   }
 
   static newComponentSpec(
diff --git a/web-common/src/features/canvas/components/charts/variants/FunnelChart.ts b/web-common/src/features/canvas/components/charts/variants/FunnelChart.ts
index 853b04ba843..0a0fd788ddc 100644
--- a/web-common/src/features/canvas/components/charts/variants/FunnelChart.ts
+++ b/web-common/src/features/canvas/components/charts/variants/FunnelChart.ts
@@ -216,7 +216,10 @@ export class FunnelChartComponent extends BaseChart<FunnelCanvasChartSpec> {
     ctx: CanvasStore,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
-    return this.provider.createChartDataQuery(ctx.runtime, timeAndFilterStore);
+    return this.provider.createChartDataQuery(
+      ctx.runtimeClient,
+      timeAndFilterStore,
+    );
   }
 
   chartTitle(fields: ChartFieldsMap) {
diff --git a/web-common/src/features/canvas/components/charts/variants/HeatmapChart.ts b/web-common/src/features/canvas/components/charts/variants/HeatmapChart.ts
index c55caba2e1c..dc39d585db1 100644
--- a/web-common/src/features/canvas/components/charts/variants/HeatmapChart.ts
+++ b/web-common/src/features/canvas/components/charts/variants/HeatmapChart.ts
@@ -128,7 +128,10 @@ export class HeatmapChartComponent extends BaseChart<HeatmapCanvasChartSpec> {
     ctx: CanvasStore,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
-    return this.provider.createChartDataQuery(ctx.runtime, timeAndFilterStore);
+    return this.provider.createChartDataQuery(
+      ctx.runtimeClient,
+      timeAndFilterStore,
+    );
   }
 
   static newComponentSpec(
diff --git a/web-common/src/features/canvas/components/charts/variants/ScatterPlotChart.ts b/web-common/src/features/canvas/components/charts/variants/ScatterPlotChart.ts
index d916fa50793..7546d3ff8c1 100644
--- a/web-common/src/features/canvas/components/charts/variants/ScatterPlotChart.ts
+++ b/web-common/src/features/canvas/components/charts/variants/ScatterPlotChart.ts
@@ -120,7 +120,10 @@ export class ScatterPlotChartComponent extends BaseChart<ScatterPlotCanvasChartS
     ctx: CanvasStore,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
-    return this.provider.createChartDataQuery(ctx.runtime, timeAndFilterStore);
+    return this.provider.createChartDataQuery(
+      ctx.runtimeClient,
+      timeAndFilterStore,
+    );
   }
 
   chartTitle(fields: ChartFieldsMap): string {
diff --git a/web-common/src/features/canvas/components/image/Image.svelte b/web-common/src/features/canvas/components/image/Image.svelte
index 4ebf86ebf1e..c5e7f8ab1b1 100644
--- a/web-common/src/features/canvas/components/image/Image.svelte
+++ b/web-common/src/features/canvas/components/image/Image.svelte
@@ -1,16 +1,18 @@
 <script lang="ts">
   import ComponentError from "@rilldata/web-common/features/components/ComponentError.svelte";
   import httpClient from "@rilldata/web-common/runtime-client/http-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import ComponentHeader from "../../ComponentHeader.svelte";
   import type { ImageComponent } from "./";
   import { getImagePosition } from "./util";
 
+  const client = useRuntimeClient();
+
   export let component: ImageComponent;
 
   $: ({ specStore } = component);
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = client);
   $: imageProperties = $specStore;
 
   $: ({ title, description, show_description_as_tooltip, alignment, url } =
diff --git a/web-common/src/features/canvas/explore-link/ExploreLink.svelte b/web-common/src/features/canvas/explore-link/ExploreLink.svelte
index 2e0740867dc..d2d886cc60c 100644
--- a/web-common/src/features/canvas/explore-link/ExploreLink.svelte
+++ b/web-common/src/features/canvas/explore-link/ExploreLink.svelte
@@ -3,15 +3,17 @@
   import type { BaseCanvasComponent } from "@rilldata/web-common/features/canvas/components/BaseCanvasComponent";
   import type { ComponentWithMetricsView } from "@rilldata/web-common/features/canvas/components/types";
   import { useExploreAvailability } from "@rilldata/web-common/features/explore-mappers/explore-validation";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { derived } from "svelte/store";
   import { useTransformCanvasToExploreState } from "./canvas-explore-transformer";
   import ExploreLink from "@rilldata/web-common/features/explores/explore-link/ExploreLink.svelte";
 
+  const client = useRuntimeClient();
+
   export let component: BaseCanvasComponent<ComponentWithMetricsView>;
   export let mode: "inline" | "dropdown-item" | "icon-button" = "inline";
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = client);
   $: organization = $page.params.organization;
   $: project = $page.params.project;
 
diff --git a/web-common/src/features/canvas/inspector/MetricSelectorDropdown.svelte b/web-common/src/features/canvas/inspector/MetricSelectorDropdown.svelte
index ed6d0318827..4679d5ca064 100644
--- a/web-common/src/features/canvas/inspector/MetricSelectorDropdown.svelte
+++ b/web-common/src/features/canvas/inspector/MetricSelectorDropdown.svelte
@@ -8,16 +8,18 @@
     ResourceKind,
     useFilteredResources,
   } from "@rilldata/web-common/features/entity-management/resource-selectors";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { isString } from "../../workspaces/visual-util";
   import type { BaseCanvasComponent } from "../components/BaseCanvasComponent";
   import type { ComponentSpec } from "../components/types";
 
+  const client = useRuntimeClient();
+
   export let component: BaseCanvasComponent;
   export let key: AllKeys<ComponentSpec>;
   export let inputParam: ComponentInputParam;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = client);
 
   $: spec = component.specStore;
 
diff --git a/web-common/src/features/canvas/inspector/chart/MarkSelector.svelte b/web-common/src/features/canvas/inspector/chart/MarkSelector.svelte
index 221b2e857fe..e4e4f67864c 100644
--- a/web-common/src/features/canvas/inspector/chart/MarkSelector.svelte
+++ b/web-common/src/features/canvas/inspector/chart/MarkSelector.svelte
@@ -8,11 +8,13 @@
   import { isFieldConfig } from "@rilldata/web-common/features/components/charts/util";
   import { themeControl } from "@rilldata/web-common/features/themes/theme-control";
   import { resolveThemeColors } from "@rilldata/web-common/features/themes/theme-utils";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import ColorPaletteSelector from "./field-config/ColorPaletteSelector.svelte";
   import FieldConfigPopover from "./field-config/FieldConfigPopover.svelte";
   import SingleColorSelector from "./field-config/SingleColorSelector.svelte";
 
+  const client = useRuntimeClient();
+
   export let key: string;
   export let metricsView: string;
   export let markConfig: FieldConfig | string;
@@ -20,7 +22,7 @@
   export let canvasName: string;
   export let onChange: (updatedConfig: FieldConfig | string) => void;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = client);
   $: ({
     canvasEntity: { selectedComponent, theme },
   } = getCanvasStore(canvasName, instanceId));
diff --git a/web-common/src/features/canvas/inspector/chart/PositionalFieldConfig.svelte b/web-common/src/features/canvas/inspector/chart/PositionalFieldConfig.svelte
index a779963f75a..6df9a130516 100644
--- a/web-common/src/features/canvas/inspector/chart/PositionalFieldConfig.svelte
+++ b/web-common/src/features/canvas/inspector/chart/PositionalFieldConfig.svelte
@@ -9,7 +9,7 @@
   import { getCanvasStore } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
   import type { FieldConfig } from "@rilldata/web-common/features/components/charts/types";
   import { isFieldConfig } from "@rilldata/web-common/features/components/charts/util";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import FieldConfigPopover from "./field-config/FieldConfigPopover.svelte";
   import MarkTypeToggle from "./field-config/MarkTypeToggle.svelte";
 
@@ -21,13 +21,14 @@
 
   export let onChange: (updatedConfig: FieldConfig | undefined) => void;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+
   $: ({
     canvasEntity: {
       selectedComponent,
       metricsView: { getTimeDimensionForMetricView },
     },
-  } = getCanvasStore(canvasName, instanceId));
+  } = getCanvasStore(canvasName, client.instanceId));
 
   $: chartFieldInput = config.meta?.chartFieldInput;
   $: multiMetricSelector = chartFieldInput?.multiFieldSelector;
diff --git a/web-common/src/features/canvas/inspector/chart/field-config/ColorRangeSelector.svelte b/web-common/src/features/canvas/inspector/chart/field-config/ColorRangeSelector.svelte
index 102ae6e45fa..fcc6e352c31 100644
--- a/web-common/src/features/canvas/inspector/chart/field-config/ColorRangeSelector.svelte
+++ b/web-common/src/features/canvas/inspector/chart/field-config/ColorRangeSelector.svelte
@@ -20,7 +20,7 @@
   } from "@rilldata/web-common/features/themes/color-config";
   import { themeControl } from "@rilldata/web-common/features/themes/theme-control";
   import { resolveThemeColors } from "@rilldata/web-common/features/themes/theme-utils";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { slide } from "svelte/transition";
   import type { ColorScheme } from "vega-typings";
 
@@ -29,6 +29,8 @@
   export let colorRangeConfig: ChartFieldInput["colorRangeSelector"];
   export let canvasName: string;
 
+  const client = useRuntimeClient();
+
   // Available Vega-Lite color schemes
   // https://vega.github.io/vega/docs/schemes/
   const colorSchemes: {
@@ -54,10 +56,9 @@
     { label: "Spectral", value: "spectral" },
   ];
 
-  $: ({ instanceId } = $runtime);
   $: ({
     canvasEntity: { theme },
-  } = getCanvasStore(canvasName, instanceId));
+  } = getCanvasStore(canvasName, client.instanceId));
 
   $: isThemeModeDark = $themeControl === "dark";
   $: resolvedTheme = resolveThemeColors($theme?.spec, isThemeModeDark);
diff --git a/web-common/src/features/canvas/inspector/fields/FieldSelectorDropdown.svelte b/web-common/src/features/canvas/inspector/fields/FieldSelectorDropdown.svelte
index e506fb6c87d..0b400bf3a53 100644
--- a/web-common/src/features/canvas/inspector/fields/FieldSelectorDropdown.svelte
+++ b/web-common/src/features/canvas/inspector/fields/FieldSelectorDropdown.svelte
@@ -3,7 +3,7 @@
   import type { SearchableFilterSelectableGroup } from "@rilldata/web-common/components/searchable-filter-menu/SearchableFilterSelectableItem";
   import SearchableMenuContent from "@rilldata/web-common/components/searchable-filter-menu/SearchableMenuContent.svelte";
   import { getCanvasStore } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useMetricFieldData } from "../selectors";
   import type { FieldType } from "../types";
 
@@ -18,12 +18,12 @@
   export let allowMultiSelect = true;
   export let allowSelectAll = false;
 
+  const client = useRuntimeClient();
+
   // Local state for optimistic updates
   let localSelectedItems: string[] = selectedItems;
 
-  $: ({ instanceId } = $runtime);
-
-  $: ctx = getCanvasStore(canvasName, instanceId);
+  $: ctx = getCanvasStore(canvasName, client.instanceId);
   $: fieldData = useMetricFieldData(
     ctx,
     metricName,
diff --git a/web-common/src/features/canvas/inspector/fields/MultiFieldInput.svelte b/web-common/src/features/canvas/inspector/fields/MultiFieldInput.svelte
index 46dab71b12d..ac58d292586 100644
--- a/web-common/src/features/canvas/inspector/fields/MultiFieldInput.svelte
+++ b/web-common/src/features/canvas/inspector/fields/MultiFieldInput.svelte
@@ -2,7 +2,7 @@
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
   import InputLabel from "@rilldata/web-common/components/forms/InputLabel.svelte";
   import { getCanvasStore } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { PlusIcon } from "lucide-svelte";
   import { useMetricFieldData } from "../selectors";
   import type { FieldType } from "../types";
@@ -17,11 +17,12 @@
   export let types: FieldType[];
   export let onMultiSelect: (items: string[]) => void = () => {};
 
+  const client = useRuntimeClient();
+
   let open = false;
   let searchValue = "";
 
-  $: ({ instanceId } = $runtime);
-  $: ctx = getCanvasStore(canvasName, instanceId);
+  $: ctx = getCanvasStore(canvasName, client.instanceId);
   $: fieldData = useMetricFieldData(ctx, metricName, types);
 </script>
 
diff --git a/web-common/src/features/canvas/inspector/fields/MultiPositionalFieldsInput.svelte b/web-common/src/features/canvas/inspector/fields/MultiPositionalFieldsInput.svelte
index f4e48219be1..0f5d69f99e5 100644
--- a/web-common/src/features/canvas/inspector/fields/MultiPositionalFieldsInput.svelte
+++ b/web-common/src/features/canvas/inspector/fields/MultiPositionalFieldsInput.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
   import { getCanvasStore } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { PlusIcon } from "lucide-svelte";
   import { useMetricFieldData } from "../selectors";
   import type { FieldType } from "../types";
@@ -16,11 +16,12 @@
   export let excludedValues: string[] | undefined = undefined;
   export let onMultiSelect: (items: string[]) => void = () => {};
 
+  const client = useRuntimeClient();
+
   let open = false;
   let searchValue = "";
 
-  $: ({ instanceId } = $runtime);
-  $: ctx = getCanvasStore(canvasName, instanceId);
+  $: ctx = getCanvasStore(canvasName, client.instanceId);
   $: fieldData = useMetricFieldData(ctx, metricName, types);
 </script>
 
diff --git a/web-common/src/features/canvas/inspector/fields/SingleFieldInput.svelte b/web-common/src/features/canvas/inspector/fields/SingleFieldInput.svelte
index ff4a96f6912..1a1427b14ed 100644
--- a/web-common/src/features/canvas/inspector/fields/SingleFieldInput.svelte
+++ b/web-common/src/features/canvas/inspector/fields/SingleFieldInput.svelte
@@ -4,9 +4,11 @@
   import InputLabel from "@rilldata/web-common/components/forms/InputLabel.svelte";
   import Search from "@rilldata/web-common/components/search/Search.svelte";
   import { getCanvasStore } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useMetricFieldData } from "../selectors";
 
+  const client = useRuntimeClient();
+
   export let metricName: string;
   export let label: string | undefined = undefined;
   export let id: string;
@@ -23,9 +25,7 @@
   let open = false;
   let searchValue = "";
 
-  $: ({ instanceId } = $runtime);
-
-  $: ctx = getCanvasStore(canvasName, instanceId);
+  $: ctx = getCanvasStore(canvasName, client.instanceId);
   $: ({ getTimeDimensionForMetricView } = ctx.canvasEntity.metricsView);
 
   $: timeDimension = getTimeDimensionForMetricView(metricName);
diff --git a/web-common/src/features/canvas/state-managers/state-managers.ts b/web-common/src/features/canvas/state-managers/state-managers.ts
index f2035f05a6c..bf816bbbaf5 100644
--- a/web-common/src/features/canvas/state-managers/state-managers.ts
+++ b/web-common/src/features/canvas/state-managers/state-managers.ts
@@ -1,5 +1,6 @@
 import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { QueryClient } from "@tanstack/svelte-query";
 import { type Writable } from "svelte/store";
 import { CanvasEntity } from "../stores/canvas-entity";
@@ -8,6 +9,7 @@ import type { CanvasResponse } from "../selector";
 
 export type CanvasStore = {
   runtime: Writable<Runtime>;
+  runtimeClient: RuntimeClient;
   canvasEntity: CanvasEntity;
   queryClient: QueryClient;
 };
@@ -58,6 +60,7 @@ export function setCanvasStore(
   canvasName: string,
   instanceId: string,
   response: CanvasResponse,
+  runtimeClient?: RuntimeClient,
 ): CanvasStore {
   const id = makeCanvasId(canvasName, instanceId);
 
@@ -71,6 +74,7 @@ export function setCanvasStore(
   const canvasEntity = new CanvasEntity(canvasName, instanceId, response);
   const store: CanvasStore = {
     runtime: runtime,
+    runtimeClient: runtimeClient!,
     canvasEntity,
     queryClient,
   };
diff --git a/web-common/src/features/components/charts/ChartContainer.svelte b/web-common/src/features/components/charts/ChartContainer.svelte
index 93781458ed7..7f0e9efb46d 100644
--- a/web-common/src/features/components/charts/ChartContainer.svelte
+++ b/web-common/src/features/components/charts/ChartContainer.svelte
@@ -8,7 +8,7 @@
   import ExploreLink from "@rilldata/web-common/features/explores/explore-link/ExploreLink.svelte";
   import { MetricsViewSelectors } from "@rilldata/web-common/features/metrics-views/metrics-view-selectors";
   import { DashboardState_ActivePage } from "@rilldata/web-common/proto/gen/rill/ui/v1/dashboard_pb";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   import Filter from "@rilldata/web-common/components/icons/Filter.svelte";
   import FilterChipsReadOnly from "@rilldata/web-common/features/dashboards/filters/FilterChipsReadOnly.svelte";
@@ -37,6 +37,8 @@
   export let organization: string | undefined = undefined;
   export let project: string | undefined = undefined;
 
+  const client = useRuntimeClient();
+
   let chartProvider: ChartProvider;
   $: {
     const chartConfig = CHART_CONFIG[chartType];
@@ -55,7 +57,7 @@
       themeMode === "dark" ? "dark" : "light"
     ];
 
-  $: metricsViewSelectors = new MetricsViewSelectors($runtime.instanceId);
+  $: metricsViewSelectors = new MetricsViewSelectors(client.instanceId);
 
   $: measures = metricsViewSelectors.getMeasuresForMetricView(
     $spec.metrics_view,
@@ -66,7 +68,7 @@
   );
 
   $: chartDataQuery = chartProvider.createChartDataQuery(
-    runtime,
+    client,
     timeAndFilterStore,
   );
 
@@ -86,7 +88,7 @@
   $: chartTitle = chartProvider?.chartTitle?.($chartData.fields) ?? "";
 
   $: exploreAvailability = showExploreLink
-    ? useExploreAvailability($runtime.instanceId, $spec?.metrics_view)
+    ? useExploreAvailability(client.instanceId, $spec?.metrics_view)
     : readable({
         isAvailable: false,
         exploreName: null,
diff --git a/web-common/src/features/components/charts/cartesian/CartesianChartProvider.ts b/web-common/src/features/components/charts/cartesian/CartesianChartProvider.ts
index 6a2ab4151f6..5383d81b7a2 100644
--- a/web-common/src/features/components/charts/cartesian/CartesianChartProvider.ts
+++ b/web-common/src/features/components/charts/cartesian/CartesianChartProvider.ts
@@ -17,15 +17,15 @@ import {
 import { mergeFilters } from "@rilldata/web-common/features/dashboards/pivot/pivot-merge-filters";
 import { createInExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import type { TimeAndFilterStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
-import {
-  getQueryServiceMetricsViewAggregationQueryOptions,
-  type MetricsViewSpecMeasure,
-  type V1Expression,
-  type V1MetricsViewAggregationDimension,
-  type V1MetricsViewAggregationMeasure,
-  type V1TimeRange,
+import type {
+  MetricsViewSpecMeasure,
+  V1Expression,
+  V1MetricsViewAggregationDimension,
+  V1MetricsViewAggregationMeasure,
+  V1TimeRange,
 } from "@rilldata/web-common/runtime-client";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+import { getQueryServiceMetricsViewAggregationQueryOptions } from "@rilldata/web-common/runtime-client/v2/gen";
 import { createQuery, keepPreviousData } from "@tanstack/svelte-query";
 import {
   derived,
@@ -150,7 +150,7 @@ export class CartesianChartProvider {
   }
 
   createChartDataQuery(
-    runtime: Writable<Runtime>,
+    client: RuntimeClient,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
     const config = get(this.spec);
@@ -199,8 +199,8 @@ export class CartesianChartProvider {
 
     // Create topN query for x dimension
     const topNXQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const {
           timeRange,
           where,
@@ -208,7 +208,6 @@ export class CartesianChartProvider {
           comparisonTimeRange,
           showTimeComparison,
         } = $timeAndFilterStore;
-        const instanceId = $runtime.instanceId;
         const enabled =
           (!hasTimeSeries || (!!timeRange?.start && !!timeRange?.end)) &&
           config.x?.type === "nominal" &&
@@ -254,9 +253,9 @@ export class CartesianChartProvider {
         }
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures: topNMeasures,
             dimensions: [{ name: dimensionName }],
             sort: xAxisSort ? [xAxisSort] : undefined,
@@ -278,8 +277,8 @@ export class CartesianChartProvider {
 
     // Create topN query for color dimension
     const topNColorQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
         const enabled =
           (!hasTimeSeries || (!!timeRange?.start && !!timeRange?.end)) &&
@@ -293,9 +292,9 @@ export class CartesianChartProvider {
         );
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions: [{ name: colorDimensionName }],
             sort: config?.y?.field
@@ -317,8 +316,8 @@ export class CartesianChartProvider {
     const topNColorQuery = createQuery(topNColorQueryOptionsStore);
 
     const queryOptionsStore = derived(
-      [runtime, timeAndFilterStore, topNXQuery, topNColorQuery],
-      ([$runtime, $timeAndFilterStore, $topNXQuery, $topNColorQuery]) => {
+      [timeAndFilterStore, topNXQuery, topNColorQuery],
+      ([$timeAndFilterStore, $topNXQuery, $topNColorQuery]) => {
         const {
           timeRange,
           where,
@@ -409,9 +408,9 @@ export class CartesianChartProvider {
             .flat();
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures: measuresWithComparison,
             dimensions,
             where: combinedWhere,
diff --git a/web-common/src/features/components/charts/circular/CircularChartProvider.ts b/web-common/src/features/components/charts/circular/CircularChartProvider.ts
index ddcc90f3715..23465210994 100644
--- a/web-common/src/features/components/charts/circular/CircularChartProvider.ts
+++ b/web-common/src/features/components/charts/circular/CircularChartProvider.ts
@@ -10,14 +10,14 @@ import { isFieldConfig } from "@rilldata/web-common/features/components/charts/u
 import { mergeFilters } from "@rilldata/web-common/features/dashboards/pivot/pivot-merge-filters";
 import { createInExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import type { TimeAndFilterStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
-import type { V1Expression } from "@rilldata/web-common/runtime-client";
-import {
-  getQueryServiceMetricsViewAggregationQueryOptions,
-  type V1MetricsViewAggregationDimension,
-  type V1MetricsViewAggregationMeasure,
-  type V1MetricsViewAggregationSort,
+import type {
+  V1Expression,
+  V1MetricsViewAggregationDimension,
+  V1MetricsViewAggregationMeasure,
+  V1MetricsViewAggregationSort,
 } from "@rilldata/web-common/runtime-client";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { getQueryServiceMetricsViewAggregationQueryOptions } from "@rilldata/web-common/runtime-client/v2/gen";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createQuery, keepPreviousData } from "@tanstack/svelte-query";
 import {
   derived,
@@ -65,7 +65,7 @@ export class CircularChartProvider {
   }
 
   createChartDataQuery(
-    runtime: Writable<Runtime>,
+    client: RuntimeClient,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
     const config = get(this.spec);
@@ -90,10 +90,9 @@ export class CircularChartProvider {
 
     // Create topN query for color dimension
     const topNColorQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
-        const instanceId = $runtime.instanceId;
         const enabled =
           (!hasTimeSeries || (!!timeRange?.start && !!timeRange?.end)) &&
           !!colorDimensionName &&
@@ -103,9 +102,9 @@ export class CircularChartProvider {
         const topNWhere = getFilterWithNullHandling(where, config.color);
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions: [{ name: colorDimensionName }],
             sort: colorSort ? [colorSort] : undefined,
@@ -125,8 +124,8 @@ export class CircularChartProvider {
     const topNColorQuery = createQuery(topNColorQueryOptionsStore);
 
     const totalQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
         const enabled =
           !!showTotal &&
@@ -136,9 +135,9 @@ export class CircularChartProvider {
         const totalWhere = getFilterWithNullHandling(where, config.color);
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             where: totalWhere,
             timeRange,
@@ -155,8 +154,8 @@ export class CircularChartProvider {
     const totalQuery = createQuery(totalQueryOptionsStore);
 
     const queryOptionsStore = derived(
-      [runtime, timeAndFilterStore, topNColorQuery, totalQuery],
-      ([$runtime, $timeAndFilterStore, $topNColorQuery, $totalQuery]) => {
+      [timeAndFilterStore, topNColorQuery, totalQuery],
+      ([$timeAndFilterStore, $topNColorQuery, $totalQuery]) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
         const topNColorData = $topNColorQuery?.data?.data;
         const enabled =
@@ -192,9 +191,9 @@ export class CircularChartProvider {
         this.combinedWhere.set(combinedWhere);
 
         const queryOptions = getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions,
             where: combinedWhere,
diff --git a/web-common/src/features/components/charts/combo/ComboChartProvider.ts b/web-common/src/features/components/charts/combo/ComboChartProvider.ts
index 6d2911c3497..6c33d25a3c8 100644
--- a/web-common/src/features/components/charts/combo/ComboChartProvider.ts
+++ b/web-common/src/features/components/charts/combo/ComboChartProvider.ts
@@ -9,14 +9,14 @@ import {
 import { mergeFilters } from "@rilldata/web-common/features/dashboards/pivot/pivot-merge-filters";
 import { createInExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import type { TimeAndFilterStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
-import {
-  getQueryServiceMetricsViewAggregationQueryOptions,
-  type MetricsViewSpecMeasure,
-  type V1Expression,
-  type V1MetricsViewAggregationDimension,
-  type V1MetricsViewAggregationMeasure,
+import type {
+  MetricsViewSpecMeasure,
+  V1Expression,
+  V1MetricsViewAggregationDimension,
+  V1MetricsViewAggregationMeasure,
 } from "@rilldata/web-common/runtime-client";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { getQueryServiceMetricsViewAggregationQueryOptions } from "@rilldata/web-common/runtime-client/v2/gen";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createQuery, keepPreviousData } from "@tanstack/svelte-query";
 import {
   derived,
@@ -81,7 +81,7 @@ export class ComboChartProvider {
   }
 
   createChartDataQuery(
-    runtime: Writable<Runtime>,
+    client: RuntimeClient,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
     const config = get(this.spec);
@@ -100,10 +100,9 @@ export class ComboChartProvider {
     const dimensionName = config.x?.field;
 
     const xAxisQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
-        const instanceId = $runtime.instanceId;
         const enabled =
           (!hasTimeSeries || (!!timeRange?.start && !!timeRange?.end)) &&
           !!dimensionName &&
@@ -129,9 +128,9 @@ export class ComboChartProvider {
         );
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures: xAxisMeasures,
             dimensions: [{ name: dimensionName }],
             sort: xAxisSort ? [xAxisSort] : undefined,
@@ -151,8 +150,8 @@ export class ComboChartProvider {
     const xAxisQuery = createQuery(xAxisQueryOptionsStore);
 
     const queryOptionsStore = derived(
-      [runtime, timeAndFilterStore, xAxisQuery],
-      ([$runtime, $timeAndFilterStore, $xAxisQuery]) => {
+      [timeAndFilterStore, xAxisQuery],
+      ([$timeAndFilterStore, $xAxisQuery]) => {
         const { timeRange, where, timeGrain, hasTimeSeries } =
           $timeAndFilterStore;
         const xTopNData = $xAxisQuery?.data?.data;
@@ -204,9 +203,9 @@ export class ComboChartProvider {
         }
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions,
             where: combinedWhere,
diff --git a/web-common/src/features/components/charts/funnel/FunnelChartProvider.ts b/web-common/src/features/components/charts/funnel/FunnelChartProvider.ts
index 886255e99ba..c3af6900701 100644
--- a/web-common/src/features/components/charts/funnel/FunnelChartProvider.ts
+++ b/web-common/src/features/components/charts/funnel/FunnelChartProvider.ts
@@ -8,14 +8,14 @@ import {
 import { mergeFilters } from "@rilldata/web-common/features/dashboards/pivot/pivot-merge-filters";
 import { createInExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import type { TimeAndFilterStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
-import {
-  getQueryServiceMetricsViewAggregationQueryOptions,
-  type V1Expression,
-  type V1MetricsViewAggregationDimension,
-  type V1MetricsViewAggregationMeasure,
-  type V1MetricsViewAggregationSort,
+import type {
+  V1Expression,
+  V1MetricsViewAggregationDimension,
+  V1MetricsViewAggregationMeasure,
+  V1MetricsViewAggregationSort,
 } from "@rilldata/web-common/runtime-client";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { getQueryServiceMetricsViewAggregationQueryOptions } from "@rilldata/web-common/runtime-client/v2/gen";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createQuery, keepPreviousData } from "@tanstack/svelte-query";
 import {
   derived,
@@ -77,7 +77,7 @@ export class FunnelChartProvider {
   }
 
   createChartDataQuery(
-    runtime: Writable<Runtime>,
+    client: RuntimeClient,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
     const config = get(this.spec);
@@ -121,10 +121,9 @@ export class FunnelChartProvider {
 
     // Create topN query for stage dimension
     const topNStageQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
-        const instanceId = $runtime.instanceId;
         const enabled =
           (!hasTimeSeries || (!!timeRange?.start && !!timeRange?.end)) &&
           !!stageDimensionName &&
@@ -134,9 +133,9 @@ export class FunnelChartProvider {
         const topNWhere = getFilterWithNullHandling(where, config.stage);
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions: [{ name: stageDimensionName }],
             sort: stageSort ? [stageSort] : undefined,
@@ -156,8 +155,8 @@ export class FunnelChartProvider {
     const topNStageQuery = createQuery(topNStageQueryOptionsStore);
 
     const queryOptionsStore = derived(
-      [runtime, timeAndFilterStore, topNStageQuery],
-      ([$runtime, $timeAndFilterStore, $topNStageQuery]) => {
+      [timeAndFilterStore, topNStageQuery],
+      ([$timeAndFilterStore, $topNStageQuery]) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
         const topNStageData = $topNStageQuery?.data?.data;
         const enabled =
@@ -204,9 +203,9 @@ export class FunnelChartProvider {
         this.combinedWhere.set(combinedWhere);
 
         const queryOptions = getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions,
             where: combinedWhere,
diff --git a/web-common/src/features/components/charts/heatmap/HeatmapChartProvider.ts b/web-common/src/features/components/charts/heatmap/HeatmapChartProvider.ts
index 3801150579c..e7ff792b60b 100644
--- a/web-common/src/features/components/charts/heatmap/HeatmapChartProvider.ts
+++ b/web-common/src/features/components/charts/heatmap/HeatmapChartProvider.ts
@@ -9,13 +9,13 @@ import {
 import { mergeFilters } from "@rilldata/web-common/features/dashboards/pivot/pivot-merge-filters";
 import { createInExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import type { TimeAndFilterStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
-import {
-  getQueryServiceMetricsViewAggregationQueryOptions,
-  type V1Expression,
-  type V1MetricsViewAggregationDimension,
-  type V1MetricsViewAggregationMeasure,
+import type {
+  V1Expression,
+  V1MetricsViewAggregationDimension,
+  V1MetricsViewAggregationMeasure,
 } from "@rilldata/web-common/runtime-client";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { getQueryServiceMetricsViewAggregationQueryOptions } from "@rilldata/web-common/runtime-client/v2/gen";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createQuery, keepPreviousData } from "@tanstack/svelte-query";
 import {
   derived,
@@ -68,7 +68,7 @@ export class HeatmapChartProvider {
   }
 
   createChartDataQuery(
-    runtime: Writable<Runtime>,
+    client: RuntimeClient,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
     const config = get(this.spec);
@@ -81,10 +81,9 @@ export class HeatmapChartProvider {
 
     // Create top level options store for X axis
     const xAxisQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
-        const instanceId = $runtime.instanceId;
         const enabled =
           (!hasTimeSeries || (!!timeRange?.start && !!timeRange?.end)) &&
           !!config.x?.field &&
@@ -105,9 +104,9 @@ export class HeatmapChartProvider {
         );
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions: [{ name: config.x?.field }],
             sort: xAxisSort ? [xAxisSort] : undefined,
@@ -126,8 +125,8 @@ export class HeatmapChartProvider {
 
     // Create top level options store for Y axis
     const yAxisQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const { timeRange, where, hasTimeSeries } = $timeAndFilterStore;
         const enabled =
           (!hasTimeSeries || (!!timeRange?.start && !!timeRange?.end)) &&
@@ -149,9 +148,9 @@ export class HeatmapChartProvider {
         );
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions: [{ name: config.y?.field }],
             sort: yAxisSort ? [yAxisSort] : undefined,
@@ -172,8 +171,8 @@ export class HeatmapChartProvider {
     const yAxisQuery = createQuery(yAxisQueryOptionsStore);
 
     const queryOptionsStore = derived(
-      [runtime, timeAndFilterStore, xAxisQuery, yAxisQuery],
-      ([$runtime, $timeAndFilterStore, $xAxisQuery, $yAxisQuery]) => {
+      [timeAndFilterStore, xAxisQuery, yAxisQuery],
+      ([$timeAndFilterStore, $xAxisQuery, $yAxisQuery]) => {
         const { timeRange, where, timeGrain, hasTimeSeries } =
           $timeAndFilterStore;
         const xTopNData = $xAxisQuery?.data?.data;
@@ -253,9 +252,9 @@ export class HeatmapChartProvider {
         }
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions,
             sort:
diff --git a/web-common/src/features/components/charts/scatter/ScatterPlotChartProvider.ts b/web-common/src/features/components/charts/scatter/ScatterPlotChartProvider.ts
index ca39171b84f..ab83c281be0 100644
--- a/web-common/src/features/components/charts/scatter/ScatterPlotChartProvider.ts
+++ b/web-common/src/features/components/charts/scatter/ScatterPlotChartProvider.ts
@@ -8,13 +8,13 @@ import { isFieldConfig } from "@rilldata/web-common/features/components/charts/u
 import { mergeFilters } from "@rilldata/web-common/features/dashboards/pivot/pivot-merge-filters";
 import { createInExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import type { TimeAndFilterStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
-import {
-  getQueryServiceMetricsViewAggregationQueryOptions,
-  type V1Expression,
-  type V1MetricsViewAggregationDimension,
-  type V1MetricsViewAggregationMeasure,
+import type {
+  V1Expression,
+  V1MetricsViewAggregationDimension,
+  V1MetricsViewAggregationMeasure,
 } from "@rilldata/web-common/runtime-client";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { getQueryServiceMetricsViewAggregationQueryOptions } from "@rilldata/web-common/runtime-client/v2/gen";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createQuery, keepPreviousData } from "@tanstack/svelte-query";
 import {
   derived,
@@ -49,7 +49,7 @@ export class ScatterPlotChartProvider {
   }
 
   createChartDataQuery(
-    runtime: Writable<Runtime>,
+    client: RuntimeClient,
     timeAndFilterStore: Readable<TimeAndFilterStore>,
   ): ChartDataQuery {
     const config = get(this.spec);
@@ -93,8 +93,8 @@ export class ScatterPlotChartProvider {
     }
 
     const topNColorQueryOptionsStore = derived(
-      [runtime, timeAndFilterStore],
-      ([$runtime, $timeAndFilterStore]) => {
+      timeAndFilterStore,
+      ($timeAndFilterStore) => {
         const { timeRange, where } = $timeAndFilterStore;
         const enabled =
           !!timeRange?.start &&
@@ -109,9 +109,9 @@ export class ScatterPlotChartProvider {
         );
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions: [{ name: colorDimensionName }],
             sort: config?.y?.field
@@ -133,8 +133,8 @@ export class ScatterPlotChartProvider {
     const topNColorQuery = createQuery(topNColorQueryOptionsStore);
 
     const queryOptionsStore = derived(
-      [runtime, timeAndFilterStore, topNColorQuery],
-      ([$runtime, $timeAndFilterStore, $topNColorQuery]) => {
+      [timeAndFilterStore, topNColorQuery],
+      ([$timeAndFilterStore, $topNColorQuery]) => {
         const { timeRange, where, timeGrain } = $timeAndFilterStore;
         const topNColorData = $topNColorQuery?.data?.data;
         const enabled =
@@ -182,9 +182,9 @@ export class ScatterPlotChartProvider {
         this.combinedWhere.set(combinedWhere);
 
         return getQueryServiceMetricsViewAggregationQueryOptions(
-          $runtime.instanceId,
-          config.metrics_view,
+          client,
           {
+            metricsView: config.metrics_view,
             measures,
             dimensions: finalDimensions,
             where: combinedWhere,
diff --git a/web-common/src/features/components/charts/types.ts b/web-common/src/features/components/charts/types.ts
index aee4e863111..c48db0d185e 100644
--- a/web-common/src/features/components/charts/types.ts
+++ b/web-common/src/features/components/charts/types.ts
@@ -24,7 +24,6 @@ import {
   type MetricsViewSpecMeasure,
   type V1MetricsViewAggregationResponseDataItem,
 } from "@rilldata/web-common/runtime-client";
-import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
 import type { Color } from "chroma-js";
 import type { TimeUnit } from "vega-lite/build/src/timeunit";
@@ -88,7 +87,7 @@ export type ChartType =
 
 export type ChartDataQuery = CreateQueryResult<
   V1MetricsViewAggregationResponse,
-  HTTPError
+  Error
 >;
 
 export type ChartFieldsMap = Record<
@@ -102,7 +101,7 @@ export type ChartDataResult = {
   data: V1MetricsViewAggregationResponseDataItem[];
   isFetching: boolean;
   fields: ChartFieldsMap;
-  error?: HTTPError | null;
+  error?: Error | null;
   theme: { primary: Color; secondary: Color };
   domainValues?: ChartDomainValues;
   isDarkMode: boolean;

From 25a80d115703811a7a0faae3f0871ad4924458eb Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 17:04:50 +0300
Subject: [PATCH 17/27] refactor: add runtimeClient to dashboard StateManagers
 and migrate core stores to v2

Bridge pattern: adds runtimeClient alongside runtime in StateManagers.
Migrates validSpecStore and timeRangeSummaryStore to v2 hooks,
removing runtime from their derived() dependencies.
---
 .../StateManagersProvider.svelte              |  4 ++
 .../state-managers/selectors/index.ts         |  7 +--
 .../state-managers/state-managers.ts          | 45 ++++++++++++-------
 .../dashboards/stores/test-data/helpers.ts    |  6 +++
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/web-common/src/features/dashboards/state-managers/StateManagersProvider.svelte b/web-common/src/features/dashboards/state-managers/StateManagersProvider.svelte
index bf6f8ca789d..d446c88b0a4 100644
--- a/web-common/src/features/dashboards/state-managers/StateManagersProvider.svelte
+++ b/web-common/src/features/dashboards/state-managers/StateManagersProvider.svelte
@@ -3,16 +3,20 @@
   import { createStateManagers, DEFAULT_STORE_KEY } from "./state-managers";
   import { useExploreState } from "../stores/dashboard-stores";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let metricsViewName: string | undefined;
   export let exploreName: string;
   export let visualEditing = false;
 
+  const client = useRuntimeClient();
+
   const stateManagers = metricsViewName
     ? createStateManagers({
         queryClient,
         metricsViewName,
         exploreName,
+        runtimeClient: client,
       })
     : undefined;
 
diff --git a/web-common/src/features/dashboards/state-managers/selectors/index.ts b/web-common/src/features/dashboards/state-managers/selectors/index.ts
index 684250e980f..719bb68492d 100644
--- a/web-common/src/features/dashboards/state-managers/selectors/index.ts
+++ b/web-common/src/features/dashboards/state-managers/selectors/index.ts
@@ -1,10 +1,7 @@
 import { chartSelectors } from "@rilldata/web-common/features/dashboards/state-managers/selectors/charts";
 import { measureFilterSelectors } from "@rilldata/web-common/features/dashboards/state-managers/selectors/measure-filters";
 import type { ExploreValidSpecResponse } from "@rilldata/web-common/features/explores/selectors";
-import type {
-  RpcStatus,
-  V1MetricsViewTimeRangeResponse,
-} from "@rilldata/web-common/runtime-client";
+import type { V1MetricsViewTimeRangeResponse } from "@rilldata/web-common/runtime-client";
 import type { QueryClient, QueryObserverResult } from "@tanstack/svelte-query";
 import { derived, type Readable } from "svelte/store";
 import type { ExploreState } from "web-common/src/features/dashboards/stores/explore-state";
@@ -25,7 +22,7 @@ import { leaderboardSelectors } from "./leaderboard";
 export type DashboardDataReadables = {
   dashboardStore: Readable<ExploreState>;
   validSpecStore: Readable<
-    QueryObserverResult<ExploreValidSpecResponse, RpcStatus>
+    QueryObserverResult<ExploreValidSpecResponse, Error>
   >;
   timeRangeSummaryStore: Readable<
     QueryObserverResult<V1MetricsViewTimeRangeResponse, unknown>
diff --git a/web-common/src/features/dashboards/state-managers/state-managers.ts b/web-common/src/features/dashboards/state-managers/state-managers.ts
index b88a58c21b8..b0115413619 100644
--- a/web-common/src/features/dashboards/state-managers/state-managers.ts
+++ b/web-common/src/features/dashboards/state-managers/state-managers.ts
@@ -1,17 +1,15 @@
 import { type ExploreState } from "@rilldata/web-common/features/dashboards/stores/explore-state";
 import { getDefaultExplorePreset } from "@rilldata/web-common/features/dashboards/url-state/getDefaultExplorePreset";
+import { type ExploreValidSpecResponse } from "@rilldata/web-common/features/explores/selectors";
 import {
-  type ExploreValidSpecResponse,
-  useExploreValidSpec,
-} from "@rilldata/web-common/features/explores/selectors";
-import {
-  type RpcStatus,
   type V1ExplorePreset,
   type V1MetricsViewTimeRangeResponse,
-  createQueryServiceMetricsViewTimeRange,
 } from "@rilldata/web-common/runtime-client";
 import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+import { createRuntimeServiceGetExplore } from "@rilldata/web-common/runtime-client/v2/gen/runtime-service";
+import { createQueryServiceMetricsViewTimeRange } from "@rilldata/web-common/runtime-client/v2/gen/query-service";
 import type { QueryClient, QueryObserverResult } from "@tanstack/svelte-query";
 import { getContext } from "svelte";
 import {
@@ -40,6 +38,7 @@ import {
 
 export type StateManagers = {
   runtime: Writable<Runtime>;
+  runtimeClient: RuntimeClient;
   metricsViewName: Writable<string>;
   exploreName: Writable<string>;
   metricsStore: Readable<MetricsExplorerStoreType>;
@@ -49,7 +48,7 @@ export type StateManagers = {
     QueryObserverResult<V1MetricsViewTimeRangeResponse, unknown>
   >;
   validSpecStore: Readable<
-    QueryObserverResult<ExploreValidSpecResponse, RpcStatus>
+    QueryObserverResult<ExploreValidSpecResponse, Error>
   >;
   queryClient: QueryClient;
   updateDashboard: DashboardCallbackExecutor;
@@ -81,10 +80,12 @@ export function createStateManagers({
   queryClient,
   metricsViewName,
   exploreName,
+  runtimeClient,
 }: {
   queryClient: QueryClient;
   metricsViewName: string;
   exploreName: string;
+  runtimeClient: RuntimeClient;
 }): StateManagers {
   const metricsViewNameStore = writable(metricsViewName);
   const exploreNameStore = writable(exploreName);
@@ -99,12 +100,21 @@ export function createStateManagers({
   );
 
   const validSpecStore: Readable<
-    QueryObserverResult<ExploreValidSpecResponse, RpcStatus>
-  > = derived([runtime, exploreNameStore], ([r, exploreName], set) =>
-    useExploreValidSpec(
-      r.instanceId,
-      exploreName,
-      undefined,
+    QueryObserverResult<ExploreValidSpecResponse, Error>
+  > = derived([exploreNameStore], ([exploreName], set) =>
+    createRuntimeServiceGetExplore(
+      runtimeClient,
+      { name: exploreName },
+      {
+        query: {
+          select: (data) =>
+            <ExploreValidSpecResponse>{
+              explore: data.explore?.explore?.state?.validSpec,
+              metricsView: data.metricsView?.metricsView?.state?.validSpec,
+            },
+          enabled: !!exploreName,
+        },
+      },
       queryClient,
     ).subscribe(set),
   );
@@ -112,12 +122,12 @@ export function createStateManagers({
   const timeRangeSummaryStore: Readable<
     QueryObserverResult<V1MetricsViewTimeRangeResponse, unknown>
   > = derived(
-    [runtime, metricsViewNameStore, validSpecStore, dashboardStore],
-    ([runtime, mvName, validSpec, $dashboardStore], set) =>
+    [metricsViewNameStore, validSpecStore, dashboardStore],
+    ([mvName, validSpec, $dashboardStore], set) =>
       createQueryServiceMetricsViewTimeRange(
-        runtime.instanceId,
-        mvName,
+        runtimeClient,
         {
+          metricsViewName: mvName,
           timeDimension: $dashboardStore?.selectedTimeDimension,
         },
         {
@@ -158,6 +168,7 @@ export function createStateManagers({
 
   return {
     runtime: runtime,
+    runtimeClient,
     metricsViewName: metricsViewNameStore,
     exploreName: exploreNameStore,
     metricsStore: metricsExplorerStore,
diff --git a/web-common/src/features/dashboards/stores/test-data/helpers.ts b/web-common/src/features/dashboards/stores/test-data/helpers.ts
index c1587dbf3fa..11d19973f58 100644
--- a/web-common/src/features/dashboards/stores/test-data/helpers.ts
+++ b/web-common/src/features/dashboards/stores/test-data/helpers.ts
@@ -1,5 +1,6 @@
 import { QueryClient } from "@tanstack/svelte-query";
 import { createStateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
+import { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { metricsExplorerStore } from "@rilldata/web-common/features/dashboards/stores/dashboard-stores";
 import { createAndExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import type { ExploreState } from "@rilldata/web-common/features/dashboards/stores/explore-state";
@@ -120,10 +121,15 @@ export function initStateManagers(metricsViewName?: string) {
       },
     },
   });
+  const runtimeClient = new RuntimeClient({
+    host: "http://localhost",
+    instanceId: "test",
+  });
   const stateManagers = createStateManagers({
     queryClient,
     metricsViewName,
     exploreName,
+    runtimeClient,
   });
 
   return { stateManagers, queryClient };

From 8392af2f2d9a1716c8877e526fb9842e35615ebc Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 17:04:57 +0300
Subject: [PATCH 18/27] refactor: migrate dashboard time-series and selector
 modules to v2 RuntimeClient

Migrates 5 TS modules that receive StateManagers: timeseries-data-store,
totals-data-store, multiple-dimension-queries, dimension-filters selector,
and dashboard selectors. Removes ctx.runtime from derived() dependencies
and switches to v2 query hooks.
---
 .../features/dashboards/selectors/index.ts    | 20 +++++-----
 .../selectors/dimension-filters.ts            |  6 +--
 .../time-series/multiple-dimension-queries.ts | 27 +++++---------
 .../time-series/timeseries-data-store.ts      | 30 ++++++---------
 .../time-series/totals-data-store.ts          | 37 ++++++-------------
 5 files changed, 45 insertions(+), 75 deletions(-)

diff --git a/web-common/src/features/dashboards/selectors/index.ts b/web-common/src/features/dashboards/selectors/index.ts
index dc434615b70..069a951ff98 100644
--- a/web-common/src/features/dashboards/selectors/index.ts
+++ b/web-common/src/features/dashboards/selectors/index.ts
@@ -1,22 +1,20 @@
-import {
-  type V1MetricsViewTimeRangeResponse,
-  createQueryServiceMetricsViewTimeRange,
-} from "@rilldata/web-common/runtime-client";
+import type { V1MetricsViewTimeRangeResponse } from "@rilldata/web-common/runtime-client";
+import { createQueryServiceMetricsViewTimeRange } from "@rilldata/web-common/runtime-client/v2/gen/query-service";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
 import { derived } from "svelte/store";
 import type { StateManagers } from "../state-managers/state-managers";
-import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
 
 export function createTimeRangeSummary(
   ctx: StateManagers,
-): CreateQueryResult<V1MetricsViewTimeRangeResponse, HTTPError> {
+): CreateQueryResult<V1MetricsViewTimeRangeResponse, Error> {
   return derived(
-    [ctx.runtime, ctx.metricsViewName, ctx.validSpecStore],
-    ([runtime, metricsViewName, validSpec], set) =>
+    [ctx.metricsViewName, ctx.validSpecStore],
+    ([metricsViewName, validSpec], set) =>
       createQueryServiceMetricsViewTimeRange(
-        runtime.instanceId,
-        metricsViewName,
-        {},
+        ctx.runtimeClient,
+        {
+          metricsViewName,
+        },
         {
           query: {
             enabled:
diff --git a/web-common/src/features/dashboards/state-managers/selectors/dimension-filters.ts b/web-common/src/features/dashboards/state-managers/selectors/dimension-filters.ts
index be2072fa79a..879434458e5 100644
--- a/web-common/src/features/dashboards/state-managers/selectors/dimension-filters.ts
+++ b/web-common/src/features/dashboards/state-managers/selectors/dimension-filters.ts
@@ -85,10 +85,10 @@ export const selectedDimensionValues = (
 
 export const useSelectedValuesForCompareDimension = (ctx: StateManagers) => {
   return derived(
-    [ctx.runtime, ctx.metricsViewName, ctx.dashboardStore],
-    ([runtime, metricsViewName, exploreState], set) =>
+    [ctx.metricsViewName, ctx.dashboardStore],
+    ([metricsViewName, exploreState], set) =>
       selectedDimensionValues(
-        runtime.instanceId,
+        ctx.runtimeClient.instanceId,
         [metricsViewName],
         exploreState.whereFilter,
         exploreState.selectedComparisonDimension ?? "",
diff --git a/web-common/src/features/dashboards/time-series/multiple-dimension-queries.ts b/web-common/src/features/dashboards/time-series/multiple-dimension-queries.ts
index b3a534e9d96..3f62d9cd944 100644
--- a/web-common/src/features/dashboards/time-series/multiple-dimension-queries.ts
+++ b/web-common/src/features/dashboards/time-series/multiple-dimension-queries.ts
@@ -26,9 +26,8 @@ import {
   type V1MetricsViewAggregationResponse,
   V1TimeGrain,
   type V1TimeSeriesValue,
-  createQueryServiceMetricsViewAggregation,
 } from "@rilldata/web-common/runtime-client";
-import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
+import { createQueryServiceMetricsViewAggregation } from "@rilldata/web-common/runtime-client/v2/gen/query-service";
 import {
   type CreateQueryResult,
   keepPreviousData,
@@ -77,13 +76,12 @@ export function getDimensionValuesForComparison(
 ): Readable<DimensionTopList> {
   return derived(
     [
-      ctx.runtime,
       ctx.metricsViewName,
       ctx.dashboardStore,
       useTimeControlStore(ctx),
       dimensionSearchText,
     ],
-    ([runtime, name, dashboardStore, timeControls, searchText], set) => {
+    ([name, dashboardStore, timeControls, searchText], set) => {
       const isValidMeasureList =
         measures?.length > 0 && measures?.every((m) => m !== undefined);
 
@@ -99,7 +97,7 @@ export function getDimensionValuesForComparison(
       let comparisonValues: (string | null)[] = [];
       if (surface === "chart") {
         return selectedDimensionValues(
-          runtime.instanceId,
+          ctx.runtimeClient.instanceId,
           [name],
           dashboardStore?.whereFilter,
           dimensionName,
@@ -126,9 +124,9 @@ export function getDimensionValuesForComparison(
 
         return derived(
           createQueryServiceMetricsViewAggregation(
-            runtime.instanceId,
-            name,
+            ctx.runtimeClient,
             {
+              metricsView: name,
               measures: measures.map((measure) => ({ name: measure })),
               dimensions: [{ name: dimensionName }],
               where: sanitiseExpression(
@@ -234,15 +232,10 @@ function getAggregationQueryForTopList(
   measures: string[],
   dimensionValues: DimensionTopList,
   isTimeComparison: boolean = false,
-): CreateQueryResult<V1MetricsViewAggregationResponse, HTTPError> {
+): CreateQueryResult<V1MetricsViewAggregationResponse, Error> {
   return derived(
-    [
-      ctx.runtime,
-      ctx.metricsViewName,
-      ctx.dashboardStore,
-      useTimeControlStore(ctx),
-    ],
-    ([runtime, metricsViewName, dashboardStore, timeStore], set) => {
+    [ctx.metricsViewName, ctx.dashboardStore, useTimeControlStore(ctx)],
+    ([metricsViewName, dashboardStore, timeStore], set) => {
       const dimensionName = dashboardStore?.selectedComparisonDimension;
       const timeGrain =
         timeStore?.selectedTimeRange?.interval || V1TimeGrain.TIME_GRAIN_DAY;
@@ -273,9 +266,9 @@ function getAggregationQueryForTopList(
       };
 
       return createQueryServiceMetricsViewAggregation(
-        runtime.instanceId,
-        metricsViewName,
+        ctx.runtimeClient,
         {
+          metricsView: metricsViewName,
           measures: measures.map((measure) => ({ name: measure })),
           dimensions: [
             { name: dimensionName },
diff --git a/web-common/src/features/dashboards/time-series/timeseries-data-store.ts b/web-common/src/features/dashboards/time-series/timeseries-data-store.ts
index 46a3cbe8319..64a70342b07 100644
--- a/web-common/src/features/dashboards/time-series/timeseries-data-store.ts
+++ b/web-common/src/features/dashboards/time-series/timeseries-data-store.ts
@@ -13,9 +13,8 @@ import {
   type V1MetricsViewAggregationResponse,
   type V1MetricsViewAggregationResponseDataItem,
   type V1MetricsViewTimeSeriesResponse,
-  createQueryServiceMetricsViewTimeSeries,
 } from "@rilldata/web-common/runtime-client";
-import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
+import { createQueryServiceMetricsViewTimeSeries } from "@rilldata/web-common/runtime-client/v2/gen/query-service";
 import {
   keepPreviousData,
   type CreateQueryResult,
@@ -55,21 +54,16 @@ export function createMetricsViewTimeSeries(
   ctx: StateManagers,
   measures: string[],
   isComparison = false,
-): CreateQueryResult<V1MetricsViewTimeSeriesResponse, HTTPError> {
+): CreateQueryResult<V1MetricsViewTimeSeriesResponse, Error> {
   return derived(
-    [
-      ctx.runtime,
-      ctx.metricsViewName,
-      ctx.dashboardStore,
-      useTimeControlStore(ctx),
-    ],
-    ([runtime, metricsViewName, dashboardStore, timeControls], set) => {
+    [ctx.metricsViewName, ctx.dashboardStore, useTimeControlStore(ctx)],
+    ([metricsViewName, dashboardStore, timeControls], set) => {
       const timeGrain = timeControls.selectedTimeRange?.interval;
 
       return createQueryServiceMetricsViewTimeSeries(
-        runtime.instanceId,
-        metricsViewName,
+        ctx.runtimeClient,
         {
+          metricsViewName,
           measureNames: measures,
           where: sanitiseExpression(
             mergeDimensionAndMeasureFilters(
@@ -178,7 +172,7 @@ export function createTimeSeriesDataStore(
             });
 
       let unfilteredTotals:
-        | CreateQueryResult<V1MetricsViewAggregationResponse, HTTPError>
+        | CreateQueryResult<V1MetricsViewAggregationResponse, Error>
         | Writable<null> = writable(null);
 
       if (dashboardStore?.selectedComparisonDimension) {
@@ -189,10 +183,10 @@ export function createTimeSeriesDataStore(
         );
       }
       let comparisonTimeSeries:
-        | CreateQueryResult<V1MetricsViewTimeSeriesResponse, HTTPError>
+        | CreateQueryResult<V1MetricsViewTimeSeriesResponse, Error>
         | Writable<null> = writable(null);
       let comparisonTotals:
-        | CreateQueryResult<V1MetricsViewAggregationResponse, HTTPError>
+        | CreateQueryResult<V1MetricsViewAggregationResponse, Error>
         | Writable<null> = writable(null);
       if (showComparison) {
         comparisonTimeSeries = createMetricsViewTimeSeries(
@@ -248,13 +242,11 @@ export function createTimeSeriesDataStore(
           const error = {};
           if (primary.error) {
             isError = true;
-            error["timeseries"] = (
-              primary.error as HTTPError
-            ).response?.data?.message;
+            error["timeseries"] = (primary.error as Error).message;
           }
           if (primaryTotal.error) {
             isError = true;
-            error["totals"] = primaryTotal.error.response?.data?.message;
+            error["totals"] = (primaryTotal.error as Error).message;
           }
           const primaryIsFetching = primary.isFetching;
           const primaryTotalIsFetching = primaryTotal.isFetching;
diff --git a/web-common/src/features/dashboards/time-series/totals-data-store.ts b/web-common/src/features/dashboards/time-series/totals-data-store.ts
index be22d38801c..c447850f633 100644
--- a/web-common/src/features/dashboards/time-series/totals-data-store.ts
+++ b/web-common/src/features/dashboards/time-series/totals-data-store.ts
@@ -7,11 +7,8 @@ import {
   sanitiseExpression,
 } from "@rilldata/web-common/features/dashboards/stores/filter-utils";
 import { useTimeControlStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
-import {
-  createQueryServiceMetricsViewAggregation,
-  type V1MetricsViewAggregationResponse,
-} from "@rilldata/web-common/runtime-client";
-import { type HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
+import type { V1MetricsViewAggregationResponse } from "@rilldata/web-common/runtime-client";
+import { createQueryServiceMetricsViewAggregation } from "@rilldata/web-common/runtime-client/v2/gen/query-service";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
 import { derived } from "svelte/store";
 
@@ -19,19 +16,14 @@ export function createTotalsForMeasure(
   ctx: StateManagers,
   measures: string[],
   isComparison = false,
-): CreateQueryResult<V1MetricsViewAggregationResponse, HTTPError> {
+): CreateQueryResult<V1MetricsViewAggregationResponse, Error> {
   return derived(
-    [
-      ctx.runtime,
-      ctx.metricsViewName,
-      useTimeControlStore(ctx),
-      ctx.dashboardStore,
-    ],
-    ([runtime, metricsViewName, timeControls, dashboard], set) =>
+    [ctx.metricsViewName, useTimeControlStore(ctx), ctx.dashboardStore],
+    ([metricsViewName, timeControls, dashboard], set) =>
       createQueryServiceMetricsViewAggregation(
-        runtime.instanceId,
-        metricsViewName,
+        ctx.runtimeClient,
         {
+          metricsView: metricsViewName,
           measures: measures.map((measure) => ({ name: measure })),
           where: sanitiseExpression(
             mergeDimensionAndMeasureFilters(
@@ -65,15 +57,10 @@ export function createUnfilteredTotalsForMeasure(
   ctx: StateManagers,
   measures: string[],
   dimensionName: string,
-): CreateQueryResult<V1MetricsViewAggregationResponse, HTTPError> {
+): CreateQueryResult<V1MetricsViewAggregationResponse, Error> {
   return derived(
-    [
-      ctx.runtime,
-      ctx.metricsViewName,
-      useTimeControlStore(ctx),
-      ctx.dashboardStore,
-    ],
-    ([runtime, metricsViewName, timeControls, dashboard], set) => {
+    [ctx.metricsViewName, useTimeControlStore(ctx), ctx.dashboardStore],
+    ([metricsViewName, timeControls, dashboard], set) => {
       const filter = sanitiseExpression(
         mergeDimensionAndMeasureFilters(
           dashboard.whereFilter,
@@ -88,9 +75,9 @@ export function createUnfilteredTotalsForMeasure(
       );
 
       createQueryServiceMetricsViewAggregation(
-        runtime.instanceId,
-        metricsViewName,
+        ctx.runtimeClient,
         {
+          metricsView: metricsViewName,
           measures: measures.map((measure) => ({ name: measure })),
           where: updatedFilter,
           timeRange: {

From b65d646367e42a9e312a68c6b1a85d903ee59317 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 17:11:41 +0300
Subject: [PATCH 19/27] refactor: migrate dashboard Svelte components from
 runtime store to useRuntimeClient

Replaces direct `runtime` store imports with `useRuntimeClient()` across
13 dashboard Svelte components. Uses stable `client.instanceId` instead
of reactive `$runtime.instanceId`.
---
 .../dashboards/big-number/MeasuresContainer.svelte       | 5 +++--
 .../dimension-search/GlobalDimensionSearchResults.svelte | 5 +++--
 .../dashboards/dimension-table/DimensionDisplay.svelte   | 9 +++++----
 .../src/features/dashboards/filters/Filters.svelte       | 5 +++--
 .../filters/dimension-filters/DimensionFilter.svelte     | 5 +++--
 .../dimension-filters/DimensionFilterReadOnlyChip.svelte | 5 +++--
 .../granular-access-policies/ViewAsButton.svelte         | 5 +++--
 .../dashboards/leaderboard/LeaderboardDisplay.svelte     | 9 +++++----
 .../features/dashboards/rows-viewer/RowsViewer.svelte    | 5 +++--
 .../dashboards/rows-viewer/RowsViewerAccordion.svelte    | 8 ++++----
 .../state-managers/loaders/DashboardStateManager.svelte  | 6 ++++--
 .../time-series/MetricsTimeSeriesCharts.svelte           | 5 +++--
 .../src/features/dashboards/workspace/Dashboard.svelte   | 5 +++--
 13 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/web-common/src/features/dashboards/big-number/MeasuresContainer.svelte b/web-common/src/features/dashboards/big-number/MeasuresContainer.svelte
index 3243b08d5d0..f2fa4dd9a36 100644
--- a/web-common/src/features/dashboards/big-number/MeasuresContainer.svelte
+++ b/web-common/src/features/dashboards/big-number/MeasuresContainer.svelte
@@ -4,7 +4,7 @@
   import { useTimeControlStore } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store";
   import { EntityStatus } from "@rilldata/web-common/features/entity-management/types";
   import { createQueryServiceMetricsViewAggregation } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { MEASURE_CONFIG } from "../config";
   import MeasureBigNumber from "./MeasureBigNumber.svelte";
   import DashboardVisibilityDropdown from "@rilldata/web-common/components/menu/DashboardVisibilityDropdown.svelte";
@@ -41,7 +41,8 @@
     },
   } = getStateManagers();
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   const timeControlsStore = useTimeControlStore(getStateManagers());
 
diff --git a/web-common/src/features/dashboards/dimension-search/GlobalDimensionSearchResults.svelte b/web-common/src/features/dashboards/dimension-search/GlobalDimensionSearchResults.svelte
index 21e7b59f6ba..89eaaee13be 100644
--- a/web-common/src/features/dashboards/dimension-search/GlobalDimensionSearchResults.svelte
+++ b/web-common/src/features/dashboards/dimension-search/GlobalDimensionSearchResults.svelte
@@ -6,7 +6,7 @@
     useDimensionSearchResults,
   } from "@rilldata/web-common/features/dashboards/dimension-search/useDimensionSearchResults";
   import { getStateManagers } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import {
     DropdownMenu,
     DropdownMenuContent,
@@ -26,7 +26,8 @@
     validSpecStore,
   } = getStateManagers();
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   let results: ReturnType<typeof useDimensionSearchResults>;
   $: if (
diff --git a/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte b/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte
index 068a6809be3..d74150f4b86 100644
--- a/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte
+++ b/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte
@@ -16,7 +16,7 @@
     type V1MetricsViewAggregationMeasure,
     type V1TimeRange,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { getComparisonRequestMeasures } from "../dashboard-utils";
   import { mergeDimensionAndMeasureFilters } from "../filters/measure-filters/measure-filter-utils";
   import { getSort } from "../leaderboard/leaderboard-utils";
@@ -64,12 +64,13 @@
 
   $: metricsViewSpec = $validSpecStore.data?.metricsView ?? {};
 
-  $: ({ name: dimensionName = "" } = dimension);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ name: dimensionName = "" } = dimension);
 
   $: selectedValues = selectedDimensionValues(
-    $runtime.instanceId,
+    client.instanceId,
     [metricsViewName],
     $dashboardStore.whereFilter,
     dimensionName,
diff --git a/web-common/src/features/dashboards/filters/Filters.svelte b/web-common/src/features/dashboards/filters/Filters.svelte
index 349089f4129..3fb84ca90c9 100644
--- a/web-common/src/features/dashboards/filters/Filters.svelte
+++ b/web-common/src/features/dashboards/filters/Filters.svelte
@@ -48,7 +48,7 @@
   import Metadata from "../time-controls/super-pill/components/Metadata.svelte";
   import { getValidComparisonOption } from "../time-controls/time-range-store";
   import { getPinnedTimeZones } from "../url-state/getDefaultExplorePreset";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   const { rillTime } = featureFlags;
 
@@ -101,7 +101,8 @@
 
   let showDefaultItem = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   $: timeRangeQuery = useMetricsViewTimeRange(instanceId, metricsViewName);
 
diff --git a/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilter.svelte b/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilter.svelte
index 95745a1a663..1f092429409 100644
--- a/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilter.svelte
+++ b/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilter.svelte
@@ -21,7 +21,7 @@
   import DimensionFilterFooter from "@rilldata/web-common/features/dashboards/filters/dimension-filters/DimensionFilterFooter.svelte";
   import DimensionFilterModeSelector from "@rilldata/web-common/features/dashboards/filters/dimension-filters/DimensionFilterModeSelector.svelte";
   import type { V1Expression } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { fly } from "svelte/transition";
   import {
     useAllSearchResultsCount,
@@ -67,7 +67,8 @@
       : [];
   let curPinned = filterData.pinned;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   $: ({
     name,
diff --git a/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilterReadOnlyChip.svelte b/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilterReadOnlyChip.svelte
index b3c3751cf4f..22882de39af 100644
--- a/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilterReadOnlyChip.svelte
+++ b/web-common/src/features/dashboards/filters/dimension-filters/DimensionFilterReadOnlyChip.svelte
@@ -6,7 +6,7 @@
     useDimensionSearch,
   } from "@rilldata/web-common/features/dashboards/filters/dimension-filters/dimension-filter-values";
   import DimensionFilterChipBody from "@rilldata/web-common/features/dashboards/filters/dimension-filters/DimensionFilterChipBody.svelte";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let name: string;
   export let metricsViewNames: string[];
@@ -19,7 +19,8 @@
   export let timeEnd: string | undefined;
   export let pinned = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   $: effectiveLabel = isInclude ? label : `Exclude ${label}`;
   $: sanitisedSearchText = inputText?.replace(/^%/, "").replace(/%$/, "");
diff --git a/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte b/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
index fc50ec6e70e..eb18e2ecd33 100644
--- a/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
+++ b/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
@@ -8,7 +8,7 @@
   import Check from "../../../components/icons/Check.svelte";
   import EyeIcon from "../../../components/icons/EyeIcon.svelte";
   import Spacer from "../../../components/icons/Spacer.svelte";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { selectedMockUserStore } from "./stores";
   import { useMockUsers } from "./useMockUsers";
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
@@ -18,7 +18,8 @@
   let viewAsMenuOpen = false;
   let open = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   $: mockUsers = useMockUsers(instanceId);
 </script>
diff --git a/web-common/src/features/dashboards/leaderboard/LeaderboardDisplay.svelte b/web-common/src/features/dashboards/leaderboard/LeaderboardDisplay.svelte
index 488c2bc9685..62f27dbb32a 100644
--- a/web-common/src/features/dashboards/leaderboard/LeaderboardDisplay.svelte
+++ b/web-common/src/features/dashboards/leaderboard/LeaderboardDisplay.svelte
@@ -5,7 +5,7 @@
     V1Expression,
     V1TimeRange,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { DimensionThresholdFilter } from "web-common/src/features/dashboards/stores/explore-state";
   import Leaderboard from "./Leaderboard.svelte";
   import LeaderboardControls from "./LeaderboardControls.svelte";
@@ -43,9 +43,10 @@
     dashboardStore,
   } = StateManagers;
 
-  let parentElement: HTMLDivElement;
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
-  $: ({ instanceId } = $runtime);
+  let parentElement: HTMLDivElement;
 
   // Reset column widths when the measure changes
   $: if ($leaderboardSortByMeasureName) {
@@ -98,7 +99,7 @@
               {parentElement}
               {timeControlsReady}
               selectedValues={selectedDimensionValues(
-                $runtime.instanceId,
+                client.instanceId,
                 [metricsViewName],
                 $dashboardStore.whereFilter,
                 dimension.name,
diff --git a/web-common/src/features/dashboards/rows-viewer/RowsViewer.svelte b/web-common/src/features/dashboards/rows-viewer/RowsViewer.svelte
index 58e4113ad0f..3787fd3511b 100644
--- a/web-common/src/features/dashboards/rows-viewer/RowsViewer.svelte
+++ b/web-common/src/features/dashboards/rows-viewer/RowsViewer.svelte
@@ -7,7 +7,7 @@
     createQueryServiceMetricsViewRows,
     type V1Expression,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { writable } from "svelte/store";
   import { useExploreState } from "web-common/src/features/dashboards/stores/dashboard-stores";
   import { PreviewTable } from "../../../components/preview-table";
@@ -19,7 +19,8 @@
   export let filters: V1Expression | undefined;
   export let timeRange: TimeRangeString;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   const SAMPLE_SIZE = 10000;
   const FALLBACK_SAMPLE_SIZE = 1000;
diff --git a/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte b/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte
index da6a5e427db..87150ff1f75 100644
--- a/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte
+++ b/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte
@@ -7,8 +7,7 @@
   import Resizer from "@rilldata/web-common/layout/Resizer.svelte";
   import { formatCompactInteger } from "@rilldata/web-common/lib/formatters";
   import { createQueryServiceMetricsViewAggregation } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { get } from "svelte/store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useExploreState } from "web-common/src/features/dashboards/stores/dashboard-stores";
   import ExportMenu from "../../exports/ExportMenu.svelte";
   import { featureFlags } from "../../feature-flags";
@@ -42,7 +41,8 @@
     },
   } = stateManagers;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   $: exploreState = useExploreState(exploreName);
   $: ({ whereFilter, dimensionThresholdFilters } = $exploreState);
@@ -131,7 +131,7 @@
   function getExportQuery() {
     return {
       metricsViewRowsRequest: {
-        instanceId: get(runtime).instanceId,
+        instanceId: client.instanceId,
         metricsViewName,
         timeStart: timeRange.start,
         timeEnd: timeRange.end,
diff --git a/web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.svelte b/web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.svelte
index eb8a1daf600..e14d178c360 100644
--- a/web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.svelte
+++ b/web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.svelte
@@ -16,7 +16,7 @@
   import { useExploreValidSpec } from "@rilldata/web-common/features/explores/selectors";
   import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
   import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { onDestroy } from "svelte";
 
   export let exploreName: string;
@@ -26,7 +26,9 @@
     | undefined = undefined;
   export let disableMostRecentDashboardState: boolean = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
+
   $: exploreSpecQuery = useExploreValidSpec(instanceId, exploreName);
   $: exploreSpec = $exploreSpecQuery.data?.explore ?? {};
   $: metricsViewName = exploreSpec?.metricsView ?? "";
diff --git a/web-common/src/features/dashboards/time-series/MetricsTimeSeriesCharts.svelte b/web-common/src/features/dashboards/time-series/MetricsTimeSeriesCharts.svelte
index dd1e0457b23..7ea077047e7 100644
--- a/web-common/src/features/dashboards/time-series/MetricsTimeSeriesCharts.svelte
+++ b/web-common/src/features/dashboards/time-series/MetricsTimeSeriesCharts.svelte
@@ -40,7 +40,7 @@
     type AvailableTimeGrain,
   } from "@rilldata/web-common/lib/time/types";
   import { type MetricsViewSpecMeasure } from "@rilldata/web-common/runtime-client/gen/index.schemas";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { DateTime } from "luxon";
   import { Button } from "../../../components/button";
   import Pivot from "../../../components/icons/Pivot.svelte";
@@ -95,7 +95,8 @@
   } = $timeControlsStore);
 
   $: activeTimeGrain = selectedTimeRange?.interval;
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   let scrubStart;
   let scrubEnd;
diff --git a/web-common/src/features/dashboards/workspace/Dashboard.svelte b/web-common/src/features/dashboards/workspace/Dashboard.svelte
index 32bde3d3b31..347ba0aad2f 100644
--- a/web-common/src/features/dashboards/workspace/Dashboard.svelte
+++ b/web-common/src/features/dashboards/workspace/Dashboard.svelte
@@ -12,7 +12,7 @@
   import { readable, type Readable } from "svelte/store";
   import { useExploreState } from "web-common/src/features/dashboards/stores/dashboard-stores";
   import { DashboardState_ActivePage } from "../../../proto/gen/rill/ui/v1/dashboard_pb";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { activeDashboardTheme } from "../../themes/active-dashboard-theme";
   import { createResolvedThemeStore } from "../../themes/selectors";
   import MeasuresContainer from "../big-number/MeasuresContainer.svelte";
@@ -52,7 +52,8 @@
   let metricsWidth = DEFAULT_TIMESERIES_WIDTH;
   let resizing = false;
 
-  $: ({ instanceId } = $runtime);
+  const client = useRuntimeClient();
+  const { instanceId } = client;
 
   $: ({ whereFilter, dimensionThresholdFilters, selectedTimeDimension } =
     $dashboardStore);

From e7bc93b804c1a74bc4b57c36a6ad3205c30ccc01 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 17:49:03 +0300
Subject: [PATCH 20/27] fix: update test infrastructure for v2 ConnectRPC hooks

- Add ConnectRPC URL routing to `DashboardFetchMocks` (handles
  `/rill.runtime.v1.{Service}/{Method}` requests with proper body
  decoding and RFC 3339 timestamp normalization)
- Inject `RuntimeClient` context in test renders that mount components
  calling `useRuntimeClient()`
---
 .../dashboards/dashboard-fetch-mocks.ts       | 79 ++++++++++++++++++-
 .../filters/test/render-filter-component.ts   | 10 ++-
 .../loaders/DashboardStateManager.spec.ts     | 12 ++-
 .../loaders/explore-web-view-store.spec.ts    | 12 ++-
 .../most-recent-explore-state.spec.ts         | 12 ++-
 5 files changed, 119 insertions(+), 6 deletions(-)

diff --git a/web-common/src/features/dashboards/dashboard-fetch-mocks.ts b/web-common/src/features/dashboards/dashboard-fetch-mocks.ts
index 95d4dc1bc53..e5e63c90c9b 100644
--- a/web-common/src/features/dashboards/dashboard-fetch-mocks.ts
+++ b/web-common/src/features/dashboards/dashboard-fetch-mocks.ts
@@ -123,8 +123,17 @@ export class DashboardFetchMocks {
     );
   }
 
-  private async fetchMock(url: string, body: string | undefined) {
+  private async fetchMock(url: string, body: string | Uint8Array | undefined) {
     const u = new URL(url);
+
+    // ConnectRPC routes: POST to /rill.runtime.v1.{Service}/{Method}
+    const connectMatch = u.pathname.match(
+      /^\/rill\.runtime\.v1\.(\w+)\/(\w+)$/,
+    );
+    if (connectMatch) {
+      return this.handleConnectRequest(connectMatch[1], connectMatch[2], body);
+    }
+
     const [, , , , type, ...parts] = u.pathname.split("/");
     let key: string;
 
@@ -162,8 +171,9 @@ export class DashboardFetchMocks {
       ok: true,
       json: () => {
         if (body && parts[2] === "aggregation") {
+          const bodyText = typeof body === "string" ? body : "";
           for (const { regex, response } of this.aggregationRequestMocks) {
-            if (!regex.test(body)) continue;
+            if (!regex.test(bodyText)) continue;
             return response;
           }
         }
@@ -172,4 +182,69 @@ export class DashboardFetchMocks {
       headers: new Map([["content-type", "application/json"]]),
     };
   }
+
+  private async handleConnectRequest(
+    service: string,
+    method: string,
+    body: string | Uint8Array | undefined,
+  ) {
+    await asyncWait(1);
+
+    // ConnectRPC may send body as Uint8Array or other typed array
+    let bodyStr: string;
+    if (typeof body === "string") {
+      bodyStr = body;
+    } else if (body && typeof body === "object") {
+      bodyStr = new TextDecoder().decode(body as ArrayBufferView);
+    } else {
+      bodyStr = "";
+    }
+    const parsed = bodyStr ? JSON.parse(bodyStr) : {};
+    let responseData: unknown;
+
+    if (service === "RuntimeService" && method === "GetExplore") {
+      responseData = this.responses.get(`resources__explore__${parsed.name}`);
+    } else if (
+      service === "QueryService" &&
+      method === "MetricsViewTimeRange"
+    ) {
+      const stored = this.responses.get(
+        `queries__metrics-views__time-range-summary__${parsed.metricsViewName}`,
+      );
+      if (stored?.timeRangeSummary) {
+        // Convert short dates to RFC 3339 for proto Timestamp compatibility
+        const s = stored.timeRangeSummary;
+        responseData = {
+          timeRangeSummary: {
+            ...s,
+            min: s.min && !s.min.includes("T") ? s.min + "T00:00:00Z" : s.min,
+            max: s.max && !s.max.includes("T") ? s.max + "T00:00:00Z" : s.max,
+          },
+        };
+      } else {
+        responseData = stored;
+      }
+    } else if (
+      service === "QueryService" &&
+      method === "MetricsViewAggregation"
+    ) {
+      for (const { regex, response } of this.aggregationRequestMocks) {
+        if (regex.test(bodyStr)) {
+          responseData = response;
+          break;
+        }
+      }
+    }
+
+    // ConnectRPC expects status, ok, headers (Headers), json(), arrayBuffer()
+    const jsonBody = responseData ?? {};
+    return {
+      status: 200,
+      ok: true,
+      headers: new Headers({ "content-type": "application/json" }),
+      json: async () => jsonBody,
+      arrayBuffer: async () =>
+        new TextEncoder().encode(JSON.stringify(jsonBody)).buffer,
+    };
+  }
 }
diff --git a/web-common/src/features/dashboards/filters/test/render-filter-component.ts b/web-common/src/features/dashboards/filters/test/render-filter-component.ts
index 04eb383c890..afec7c2c3fc 100644
--- a/web-common/src/features/dashboards/filters/test/render-filter-component.ts
+++ b/web-common/src/features/dashboards/filters/test/render-filter-component.ts
@@ -2,6 +2,10 @@ import Filters from "@rilldata/web-common/features/dashboards/filters/Filters.sv
 import { DEFAULT_STORE_KEY } from "@rilldata/web-common/features/dashboards/state-managers/state-managers";
 import { AD_BIDS_METRICS_NAME } from "@rilldata/web-common/features/dashboards/stores/test-data/data";
 import { initStateManagers } from "@rilldata/web-common/features/dashboards/stores/test-data/helpers";
+import {
+  RUNTIME_CONTEXT_KEY,
+  RuntimeClient,
+} from "@rilldata/web-common/runtime-client/v2";
 import { render } from "@testing-library/svelte";
 
 export function renderFilterComponent(hasTimeSeries = false) {
@@ -13,9 +17,13 @@ export function renderFilterComponent(hasTimeSeries = false) {
       metricsViewName: AD_BIDS_METRICS_NAME,
       hasTimeSeries,
     },
-    context: new Map([
+    context: new Map<string | symbol, unknown>([
       [DEFAULT_STORE_KEY as unknown as string, stateManagers as unknown],
       ["$$_queryClient", queryClient as unknown],
+      [
+        RUNTIME_CONTEXT_KEY,
+        new RuntimeClient({ host: "http://localhost", instanceId: "test" }),
+      ],
     ]),
   });
 
diff --git a/web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.spec.ts b/web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.spec.ts
index 88daa28dc92..244f7df0be9 100644
--- a/web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.spec.ts
+++ b/web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.spec.ts
@@ -40,6 +40,10 @@ import {
   V1ExploreComparisonMode,
   V1TimeGrain,
 } from "@rilldata/web-common/runtime-client";
+import {
+  RUNTIME_CONTEXT_KEY,
+  RuntimeClient,
+} from "@rilldata/web-common/runtime-client/v2";
 import { render, screen, waitFor } from "@testing-library/svelte";
 import { readable } from "svelte/store";
 import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -485,7 +489,13 @@ function renderDashboardStateManager(
     },
     // TODO: we need to make sure every single query uses an explicit queryClient instead of the global one
     //       only then we can use a fresh client here.
-    context: new Map([["$$_queryClient", queryClient]]),
+    context: new Map<string | symbol, unknown>([
+      ["$$_queryClient", queryClient],
+      [
+        RUNTIME_CONTEXT_KEY,
+        new RuntimeClient({ host: "http://localhost", instanceId: "test" }),
+      ],
+    ]),
   });
 
   return { queryClient, renderResults };
diff --git a/web-common/src/features/dashboards/state-managers/loaders/explore-web-view-store.spec.ts b/web-common/src/features/dashboards/state-managers/loaders/explore-web-view-store.spec.ts
index 39a125ac3a3..48b1a7f678f 100644
--- a/web-common/src/features/dashboards/state-managers/loaders/explore-web-view-store.spec.ts
+++ b/web-common/src/features/dashboards/state-managers/loaders/explore-web-view-store.spec.ts
@@ -30,6 +30,10 @@ import {
 import DashboardStateManagerTest from "@rilldata/web-common/features/dashboards/state-managers/loaders/test/DashboardStateManagerTest.svelte";
 import { getCleanMetricsExploreForAssertion } from "@rilldata/web-common/features/dashboards/url-state/url-state-variations.spec";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
+import {
+  RUNTIME_CONTEXT_KEY,
+  RuntimeClient,
+} from "@rilldata/web-common/runtime-client/v2";
 import { render, screen, waitFor } from "@testing-library/svelte";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -252,7 +256,13 @@ function renderDashboardStateManager() {
     },
     // TODO: we need to make sure every single query uses an explicit queryClient instead of the global one
     //       only then we can use a fresh client here.
-    context: new Map([["$$_queryClient", queryClient]]),
+    context: new Map<string | symbol, unknown>([
+      ["$$_queryClient", queryClient],
+      [
+        RUNTIME_CONTEXT_KEY,
+        new RuntimeClient({ host: "http://localhost", instanceId: "test" }),
+      ],
+    ]),
   });
 
   return { queryClient, renderResults };
diff --git a/web-common/src/features/dashboards/state-managers/most-recent-explore-state.spec.ts b/web-common/src/features/dashboards/state-managers/most-recent-explore-state.spec.ts
index e4397b5f93d..bb7a6432511 100644
--- a/web-common/src/features/dashboards/state-managers/most-recent-explore-state.spec.ts
+++ b/web-common/src/features/dashboards/state-managers/most-recent-explore-state.spec.ts
@@ -31,6 +31,10 @@ import {
   DashboardState_LeaderboardSortDirection,
   DashboardState_LeaderboardSortType,
 } from "@rilldata/web-common/proto/gen/rill/ui/v1/dashboard_pb";
+import {
+  RUNTIME_CONTEXT_KEY,
+  RuntimeClient,
+} from "@rilldata/web-common/runtime-client/v2";
 import { render, screen, waitFor } from "@testing-library/svelte";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -179,7 +183,13 @@ function renderDashboardStateManager() {
     },
     // TODO: we need to make sure every single query uses an explicit queryClient instead of the global one
     //       only then we can use a fresh client here.
-    context: new Map([["$$_queryClient", queryClient]]),
+    context: new Map<string | symbol, unknown>([
+      ["$$_queryClient", queryClient],
+      [
+        RUNTIME_CONTEXT_KEY,
+        new RuntimeClient({ host: "http://localhost", instanceId: "test" }),
+      ],
+    ]),
   });
 
   return { queryClient, renderResults };

From 2267e4d03585e4fbb77459486206b0c919064fce Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 18:03:04 +0300
Subject: [PATCH 21/27] refactor: migrate export and pivot-query modules from
 runtime store to v2 RuntimeClient

Replace `get(runtime).instanceId` with explicit `instanceId` parameters in
tdd-export, pivot-export, and dimension-table-export. Switch pivot-queries
from Orval hook to v2 `createQueryServiceMetricsViewAggregation`, threading
`runtimeClient` through `PivotDashboardContext`.
---
 .../aggregation-request-builder.spec.ts       |  3 +
 .../dimension-table/dimension-table-export.ts |  6 +-
 .../dashboards/pivot/pivot-data-store.ts      |  1 +
 .../features/dashboards/pivot/pivot-export.ts |  6 +-
 .../dashboards/pivot/pivot-queries.ts         | 67 +++++++++----------
 .../src/features/dashboards/pivot/types.ts    |  2 +
 .../time-dimension-details/tdd-export.ts      |  6 +-
 7 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/web-common/src/features/dashboards/aggregation-request-builder.spec.ts b/web-common/src/features/dashboards/aggregation-request-builder.spec.ts
index bd634aa8ef1..f1e0fe35295 100644
--- a/web-common/src/features/dashboards/aggregation-request-builder.spec.ts
+++ b/web-common/src/features/dashboards/aggregation-request-builder.spec.ts
@@ -211,6 +211,7 @@ describe("Report rows and columns", () => {
       it(testCase.title, async () => {
         await runTest(testCase, (exploreState, timeControlState) =>
           getDimensionTableAggregationRequestForTime({
+            instanceId: "",
             metricsViewName: AD_BIDS_METRICS_NAME,
             exploreState,
             timeRange: {
@@ -369,6 +370,7 @@ describe("Report rows and columns", () => {
           testCase,
           (exploreState, timeControlState) =>
             getTDDAggregationRequest({
+              instanceId: "",
               metricsViewName: AD_BIDS_METRICS_NAME,
               exploreState,
               timeControlState,
@@ -504,6 +506,7 @@ describe("Report rows and columns", () => {
           testCase,
           (exploreState, timeControlState) =>
             getPivotAggregationRequest({
+              instanceId: "",
               metricsViewName: AD_BIDS_METRICS_NAME,
               timeDimension:
                 AD_BIDS_METRICS_3_MEASURES_DIMENSIONS_WITH_TIME.timeDimension!,
diff --git a/web-common/src/features/dashboards/dimension-table/dimension-table-export.ts b/web-common/src/features/dashboards/dimension-table/dimension-table-export.ts
index 5a08a66f914..2f0bed2b820 100644
--- a/web-common/src/features/dashboards/dimension-table/dimension-table-export.ts
+++ b/web-common/src/features/dashboards/dimension-table/dimension-table-export.ts
@@ -18,7 +18,6 @@ import type {
   V1Query,
   V1TimeRange,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import { get } from "svelte/store";
 import { buildWhereParamForDimensionTableAndTDDExports } from "../../exports/export-filters";
 import { dimensionSearchText as dimensionSearchTextStore } from "../stores/dashboard-stores";
@@ -69,6 +68,7 @@ export function getDimensionTableExportQuery(
 
   const query: V1Query = {
     metricsViewAggregationRequest: getDimensionTableAggregationRequestForTime({
+      instanceId: ctx.runtimeClient.instanceId,
       metricsViewName,
       exploreState,
       timeRange,
@@ -81,12 +81,14 @@ export function getDimensionTableExportQuery(
 }
 
 export function getDimensionTableAggregationRequestForTime({
+  instanceId,
   metricsViewName,
   exploreState,
   timeRange,
   comparisonTimeRange,
   dimensionSearchText,
 }: {
+  instanceId: string;
   metricsViewName: string;
   exploreState: ExploreState;
   timeRange: V1TimeRange;
@@ -128,7 +130,7 @@ export function getDimensionTableAggregationRequestForTime({
   );
 
   return {
-    instanceId: get(runtime).instanceId,
+    instanceId,
     metricsView: metricsViewName,
     dimensions: [
       {
diff --git a/web-common/src/features/dashboards/pivot/pivot-data-store.ts b/web-common/src/features/dashboards/pivot/pivot-data-store.ts
index 142f293fbac..e2a68c27113 100644
--- a/web-common/src/features/dashboards/pivot/pivot-data-store.ts
+++ b/web-common/src/features/dashboards/pivot/pivot-data-store.ts
@@ -724,6 +724,7 @@ export const usePivotForExplore = memoizeMetricsStore<PivotDataStore>(
   (ctx: StateManagers) => {
     const pivotConfig = getPivotConfig(ctx);
     const pivotDashboardContext: PivotDashboardContext = {
+      runtimeClient: ctx.runtimeClient,
       metricsViewName: ctx.metricsViewName,
       queryClient: ctx.queryClient,
       enabled: !!ctx.dashboardStore,
diff --git a/web-common/src/features/dashboards/pivot/pivot-export.ts b/web-common/src/features/dashboards/pivot/pivot-export.ts
index b34e9aba28c..fb10e427b0a 100644
--- a/web-common/src/features/dashboards/pivot/pivot-export.ts
+++ b/web-common/src/features/dashboards/pivot/pivot-export.ts
@@ -12,7 +12,6 @@ import {
   type V1TimeRange,
 } from "@rilldata/web-common/runtime-client";
 import { get } from "svelte/store";
-import { runtime } from "../../../runtime-client/runtime-store";
 import type { StateManagers } from "../state-managers/state-managers";
 import { getPivotConfig } from "./pivot-data-config";
 import { prepareMeasureForComparison } from "./pivot-utils";
@@ -62,6 +61,7 @@ export function getPivotExportQuery(ctx: StateManagers, isScheduled: boolean) {
 
   const query: V1Query = {
     metricsViewAggregationRequest: getPivotAggregationRequest({
+      instanceId: ctx.runtimeClient.instanceId,
       metricsViewName,
       timeDimension:
         exploreState.selectedTimeDimension ||
@@ -82,6 +82,7 @@ export function getPivotExportQuery(ctx: StateManagers, isScheduled: boolean) {
 }
 
 export function getPivotAggregationRequest({
+  instanceId,
   metricsViewName,
   timeDimension,
   exploreState,
@@ -93,6 +94,7 @@ export function getPivotAggregationRequest({
   isFlat,
   pivotState,
 }: {
+  instanceId: string;
   metricsViewName: string;
   timeDimension: string;
   exploreState: ExploreState;
@@ -179,7 +181,7 @@ export function getPivotAggregationRequest({
   }
 
   return {
-    instanceId: get(runtime).instanceId,
+    instanceId,
     metricsView: metricsViewName,
     timeRange,
     comparisonTimeRange: comparisonTime,
diff --git a/web-common/src/features/dashboards/pivot/pivot-queries.ts b/web-common/src/features/dashboards/pivot/pivot-queries.ts
index 8d53d410431..6bc0105970c 100644
--- a/web-common/src/features/dashboards/pivot/pivot-queries.ts
+++ b/web-common/src/features/dashboards/pivot/pivot-queries.ts
@@ -11,10 +11,9 @@ import {
   type V1MetricsViewAggregationResponse,
   type V1MetricsViewAggregationResponseDataItem,
   type V1MetricsViewAggregationSort,
-  createQueryServiceMetricsViewAggregation,
 } from "@rilldata/web-common/runtime-client";
 import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { createQueryServiceMetricsViewAggregation } from "@rilldata/web-common/runtime-client/v2/gen/query-service";
 import {
   type CreateQueryResult,
   keepPreviousData,
@@ -72,41 +71,39 @@ export function createPivotAggregationRowQuery(
     hasComparison = true;
   }
 
-  return derived(
-    [runtime, ctx.metricsViewName],
-    ([$runtime, metricsViewName], set) =>
-      createQueryServiceMetricsViewAggregation(
-        $runtime.instanceId,
-        metricsViewName,
-        {
-          measures: prepareMeasureForComparison(measures),
-          dimensions,
-          where: sanitiseExpression(whereFilter, undefined),
-          timeRange: {
-            start: timeRange?.start ? timeRange.start : config.time.timeStart,
-            end: timeRange?.end ? timeRange.end : config.time.timeEnd,
-            timeDimension: config.time.timeDimension,
-          },
-          comparisonTimeRange:
-            hasComparison && comparisonTime
-              ? {
-                  start: comparisonTime.start,
-                  end: comparisonTime.end,
-                  timeDimension: config.time.timeDimension,
-                }
-              : undefined,
-          sort,
-          limit,
-          offset,
+  return derived([ctx.metricsViewName], ([metricsViewName], set) =>
+    createQueryServiceMetricsViewAggregation(
+      ctx.runtimeClient,
+      {
+        metricsView: metricsViewName,
+        measures: prepareMeasureForComparison(measures),
+        dimensions,
+        where: sanitiseExpression(whereFilter, undefined),
+        timeRange: {
+          start: timeRange?.start ? timeRange.start : config.time.timeStart,
+          end: timeRange?.end ? timeRange.end : config.time.timeEnd,
+          timeDimension: config.time.timeDimension,
         },
-        {
-          query: {
-            enabled: ctx.enabled,
-            placeholderData: keepPreviousData,
-          },
+        comparisonTimeRange:
+          hasComparison && comparisonTime
+            ? {
+                start: comparisonTime.start,
+                end: comparisonTime.end,
+                timeDimension: config.time.timeDimension,
+              }
+            : undefined,
+        sort,
+        limit,
+        offset,
+      },
+      {
+        query: {
+          enabled: ctx.enabled,
+          placeholderData: keepPreviousData,
         },
-        ctx.queryClient,
-      ).subscribe(set),
+      },
+      ctx.queryClient,
+    ).subscribe(set),
   );
 }
 
diff --git a/web-common/src/features/dashboards/pivot/types.ts b/web-common/src/features/dashboards/pivot/types.ts
index 2e619a2ef69..1766f624c09 100644
--- a/web-common/src/features/dashboards/pivot/types.ts
+++ b/web-common/src/features/dashboards/pivot/types.ts
@@ -6,6 +6,7 @@ import type {
   V1MetricsViewAggregationResponseDataItem,
   V1TimeGrain,
 } from "@rilldata/web-common/runtime-client";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { QueryClient } from "@tanstack/svelte-query";
 import type {
   ColumnDef,
@@ -40,6 +41,7 @@ export interface PivotCell {
 }
 
 export interface PivotDashboardContext {
+  runtimeClient: RuntimeClient;
   metricsViewName: Readable<string>;
   queryClient: QueryClient;
   enabled: boolean;
diff --git a/web-common/src/features/dashboards/time-dimension-details/tdd-export.ts b/web-common/src/features/dashboards/time-dimension-details/tdd-export.ts
index 3152cfb04f8..0a3404497ba 100644
--- a/web-common/src/features/dashboards/time-dimension-details/tdd-export.ts
+++ b/web-common/src/features/dashboards/time-dimension-details/tdd-export.ts
@@ -14,7 +14,6 @@ import type {
   V1Query,
   V1TimeRange,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import { get } from "svelte/store";
 import { buildWhereParamForDimensionTableAndTDDExports } from "../../exports/export-filters";
 import { dimensionSearchText as dimensionSearchTextStore } from "../stores/dashboard-stores";
@@ -31,6 +30,7 @@ export function getTDDExportQuery(
 
   const query: V1Query = {
     metricsViewAggregationRequest: getTDDAggregationRequest({
+      instanceId: ctx.runtimeClient.instanceId,
       metricsViewName,
       exploreState,
       timeControlState,
@@ -45,6 +45,7 @@ export function getTDDExportQuery(
 }
 
 export function getTDDAggregationRequest({
+  instanceId,
   metricsViewName,
   exploreState,
   timeControlState,
@@ -53,6 +54,7 @@ export function getTDDAggregationRequest({
   dimensionSearchText,
   isScheduled,
 }: {
+  instanceId: string;
   metricsViewName: string;
   exploreState: ExploreState;
   timeControlState: TimeControlState;
@@ -94,7 +96,7 @@ export function getTDDAggregationRequest({
     exploreState.selectedTimeDimension || metricsViewSpec.timeDimension || "";
 
   return {
-    instanceId: get(runtime).instanceId,
+    instanceId,
     metricsView: metricsViewName,
     dimensions: [
       { name: dimensionName },

From d4e0b175f3154b189487e6a3872d54b5267b7f04 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 18:28:08 +0300
Subject: [PATCH 22/27] refactor: migrate time controls and time ranges from
 runtime store to explicit instanceId

Add `instanceId` parameter to `deriveInterval()` and `resolveTimeRanges()`
instead of reading from the global `runtime` store. Thread `instanceId`
through callers: DashboardStateSync, Filters, FiltersForm, canvas TimeState,
and explore-mappers utils.
---
 .../alerts/data-tab/AlertDialogDataTab.svelte |  2 +-
 .../src/features/canvas/stores/time-state.ts  |  7 +++-
 .../dashboards/filters/Filters.svelte         |  2 ++
 .../loaders/DashboardStateSync.ts             |  4 ++-
 .../time-controls/new-time-controls.ts        | 32 ++++++++++++++-----
 .../time-controls/rill-time-ranges.ts         |  4 +--
 .../src/features/explore-mappers/utils.ts     |  1 +
 .../BaseScheduledReportForm.svelte            |  2 +-
 .../scheduled-reports/FiltersForm.svelte      |  2 ++
 9 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/web-common/src/features/alerts/data-tab/AlertDialogDataTab.svelte b/web-common/src/features/alerts/data-tab/AlertDialogDataTab.svelte
index 8e7e72e1ff3..ff6794730e7 100644
--- a/web-common/src/features/alerts/data-tab/AlertDialogDataTab.svelte
+++ b/web-common/src/features/alerts/data-tab/AlertDialogDataTab.svelte
@@ -51,7 +51,7 @@
 
 <div class="flex flex-col gap-y-3">
   <FormSection title="Filters">
-    <FiltersForm {filters} {timeControls} maxWidth={750} />
+    <FiltersForm {instanceId} {filters} {timeControls} maxWidth={750} />
   </FormSection>
   <FormSection
     description="Select the measures you want to monitor."
diff --git a/web-common/src/features/canvas/stores/time-state.ts b/web-common/src/features/canvas/stores/time-state.ts
index 81f71ed2b93..437c1556c8e 100644
--- a/web-common/src/features/canvas/stores/time-state.ts
+++ b/web-common/src/features/canvas/stores/time-state.ts
@@ -156,7 +156,12 @@ export class TimeState {
         }
 
         const promises = metricsViewsWithTimeSeries.map((mvName) => {
-          return deriveInterval(range, mvName, timeZone);
+          return deriveInterval(
+            range,
+            this.parent.instanceId,
+            mvName,
+            timeZone,
+          );
         });
 
         Promise.all(promises)
diff --git a/web-common/src/features/dashboards/filters/Filters.svelte b/web-common/src/features/dashboards/filters/Filters.svelte
index 3fb84ca90c9..45abbfcb8c6 100644
--- a/web-common/src/features/dashboards/filters/Filters.svelte
+++ b/web-common/src/features/dashboards/filters/Filters.svelte
@@ -235,6 +235,7 @@
 
     const { interval, grain } = await deriveInterval(
       timeRangeName,
+      instanceId,
       metricsViewName,
       activeTimeZone,
       column,
@@ -297,6 +298,7 @@
 
     const { interval, grain } = await deriveInterval(
       alias,
+      instanceId,
       metricsViewName,
       tz,
       selectedTimeDimension,
diff --git a/web-common/src/features/dashboards/state-managers/loaders/DashboardStateSync.ts b/web-common/src/features/dashboards/state-managers/loaders/DashboardStateSync.ts
index 9937c619c7e..6a1184b4d74 100644
--- a/web-common/src/features/dashboards/state-managers/loaders/DashboardStateSync.ts
+++ b/web-common/src/features/dashboards/state-managers/loaders/DashboardStateSync.ts
@@ -51,7 +51,7 @@ export class DashboardStateSync {
   }
 
   public constructor(
-    instanceId: string,
+    private readonly instanceId: string,
     metricsViewName: string,
     private readonly exploreName: string,
     private readonly extraPrefix: string | undefined,
@@ -150,6 +150,7 @@ export class DashboardStateSync {
         initExploreState.selectedTimeRange,
         // initExploreState.selectedComparisonTimeRange,
       ] = await resolveTimeRanges(
+        this.instanceId,
         exploreSpec,
         [
           initExploreState.selectedTimeRange,
@@ -245,6 +246,7 @@ export class DashboardStateSync {
         partialExplore.selectedTimeRange,
         // partialExplore.selectedComparisonTimeRange,
       ] = await resolveTimeRanges(
+        this.instanceId,
         exploreSpec,
         [
           partialExplore.selectedTimeRange,
diff --git a/web-common/src/features/dashboards/time-controls/new-time-controls.ts b/web-common/src/features/dashboards/time-controls/new-time-controls.ts
index c13883bdd1e..a07b420820c 100644
--- a/web-common/src/features/dashboards/time-controls/new-time-controls.ts
+++ b/web-common/src/features/dashboards/time-controls/new-time-controls.ts
@@ -165,9 +165,16 @@ class MetricsTimeControls {
   private _subrange = new IntervalStore();
   private _comparisonRange = new IntervalStore();
   private _showComparison: Writable<boolean> = writable(false);
+  private _instanceId: string;
   private _metricsViewName: string;
 
-  constructor(maxStart: DateTime, maxEnd: DateTime, metricsViewName: string) {
+  constructor(
+    maxStart: DateTime,
+    maxEnd: DateTime,
+    instanceId: string,
+    metricsViewName: string,
+  ) {
+    this._instanceId = instanceId;
     this._metricsViewName = metricsViewName;
     const maxInterval = Interval.fromDateTimes(
       maxStart.setZone("UTC"),
@@ -188,7 +195,7 @@ class MetricsTimeControls {
     if (rightAnchor) {
       const interval = await deriveInterval(
         iso,
-
+        this._instanceId,
         this._metricsViewName,
         get(this._zone).name,
       );
@@ -204,7 +211,7 @@ class MetricsTimeControls {
     if (rightAnchor) {
       const interval = await deriveInterval(
         name,
-
+        this._instanceId,
         this._metricsViewName,
         get(this._zone).name,
       );
@@ -284,11 +291,21 @@ class MetricsTimeControls {
 class TimeControls {
   private _timeControls = new Map<string, MetricsTimeControls>();
 
-  get(metricsViewName: string, maxStart?: DateTime, maxEnd?: DateTime) {
+  get(
+    metricsViewName: string,
+    instanceId?: string,
+    maxStart?: DateTime,
+    maxEnd?: DateTime,
+  ) {
     let store = this._timeControls.get(metricsViewName);
 
-    if (!store && maxStart && maxEnd) {
-      store = new MetricsTimeControls(maxStart, maxEnd, metricsViewName);
+    if (!store && maxStart && maxEnd && instanceId) {
+      store = new MetricsTimeControls(
+        maxStart,
+        maxEnd,
+        instanceId,
+        metricsViewName,
+      );
       this._timeControls.set(metricsViewName, store);
     } else if (!store) {
       throw new Error("TimeControls.get() called without maxStart and maxEnd");
@@ -312,7 +329,6 @@ export function isRillPeriodToDate(value: string): value is RillPeriodToDate {
   return RILL_PERIOD_TO_DATE.includes(value as RillPeriodToDate);
 }
 
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import {
   getAllowedGrains,
   GrainAliasToV1TimeGrain,
@@ -331,6 +347,7 @@ import { getDefaultRangeBuckets } from "@rilldata/web-common/lib/time/defaults";
 
 export async function deriveInterval(
   name: RillPeriodToDate | RillPreviousPeriod | ISODurationString | string,
+  instanceId: string,
   metricsViewName: string,
   activeTimeZone: string,
   timeDimension?: string,
@@ -352,7 +369,6 @@ export async function deriveInterval(
     const parsed = parseRillTime(name);
 
     // We have a RillTime string
-    const instanceId = get(runtime).instanceId;
     const cacheBust = name.includes("now");
 
     const response = await fetchTimeRanges({
diff --git a/web-common/src/features/dashboards/time-controls/rill-time-ranges.ts b/web-common/src/features/dashboards/time-controls/rill-time-ranges.ts
index fe867c28821..a2446e11ec4 100644
--- a/web-common/src/features/dashboards/time-controls/rill-time-ranges.ts
+++ b/web-common/src/features/dashboards/time-controls/rill-time-ranges.ts
@@ -1,7 +1,5 @@
 import { validateRillTime } from "@rilldata/web-common/features/dashboards/url-state/time-ranges/parser";
 import type { DashboardTimeControls } from "@rilldata/web-common/lib/time/types";
-import { get } from "svelte/store";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import {
   getQueryServiceMetricsViewTimeRangesQueryKey,
   queryServiceMetricsViewTimeRanges,
@@ -10,6 +8,7 @@ import {
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
 
 export async function resolveTimeRanges(
+  instanceId: string,
   exploreSpec: V1ExploreSpec,
   timeRanges: (DashboardTimeControls | undefined)[],
   timeZone: string | undefined,
@@ -40,7 +39,6 @@ export async function resolveTimeRanges(
 
   if (rillTimes.length === 0) return timeRangesToReturn;
 
-  const instanceId = get(runtime).instanceId;
   const metricsViewName = exploreSpec.metricsView!;
 
   try {
diff --git a/web-common/src/features/explore-mappers/utils.ts b/web-common/src/features/explore-mappers/utils.ts
index d40bd5f389c..69ce1e57001 100644
--- a/web-common/src/features/explore-mappers/utils.ts
+++ b/web-common/src/features/explore-mappers/utils.ts
@@ -102,6 +102,7 @@ export async function fillTimeRange(
   // Resolve time range overriding ref to `executionTime` and set to custom.
   // This keeps the time range consistent regardless of when the link is opened.
   [exploreState.selectedTimeRange] = await resolveTimeRanges(
+    get(runtime).instanceId,
     exploreSpec,
     [exploreState.selectedTimeRange],
     exploreState.selectedTimezone,
diff --git a/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte b/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte
index 76520ff58bf..ffa2612d7c1 100644
--- a/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte
+++ b/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte
@@ -126,7 +126,7 @@
 
     <div class="flex flex-col gap-y-3">
       <InputLabel label="Filters" id="filters" capitalize={false} />
-      <FiltersForm {filters} {timeControls} side="top" />
+      <FiltersForm {instanceId} {filters} {timeControls} side="top" />
     </div>
 
     <RowsAndColumnsForm
diff --git a/web-common/src/features/scheduled-reports/FiltersForm.svelte b/web-common/src/features/scheduled-reports/FiltersForm.svelte
index 6a34655ece0..d182012db00 100644
--- a/web-common/src/features/scheduled-reports/FiltersForm.svelte
+++ b/web-common/src/features/scheduled-reports/FiltersForm.svelte
@@ -28,6 +28,7 @@
   import { onMount } from "svelte";
   import { fly } from "svelte/transition";
 
+  export let instanceId: string;
   export let filters: Filters;
   export let timeControls: TimeControls;
   export let readOnly = false;
@@ -205,6 +206,7 @@
 
     const { interval, grain } = await deriveInterval(
       name,
+      instanceId,
       metricsViewName,
       $selectedTimezone,
       timeDimension,

From bfe9b4bc2db2c09cdeb4154b946f6bc408f2d162 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 19:19:11 +0300
Subject: [PATCH 23/27] refactor: migrate canvas, explores, and state-managers
 from runtime store to v2 RuntimeClient

- Remove unused `runtime` property from dashboard and canvas StateManagers
- Delete dead code: `getValidDashboardsQueryOptions` and `getMetricsViewSchemaOptions`
- Migrate 10 canvas Svelte components to `useRuntimeClient()`
- Migrate canvas markdown `util.ts` to accept explicit `instanceId` parameter
- Migrate 2 explores Svelte components to `useRuntimeClient()`
---
 .../src/features/canvas/CanvasBuilder.svelte  |  6 ++-
 .../canvas/CanvasDashboardEmbed.svelte        |  6 ++-
 .../src/features/canvas/CanvasEditor.svelte   |  6 ++-
 .../components/charts/CanvasChart.svelte      |  6 ++-
 .../leaderboard/LeaderboardDisplay.svelte     |  6 ++-
 .../components/markdown/Markdown.svelte       |  8 +++-
 .../canvas/components/markdown/util.ts        |  5 +--
 .../canvas/filters/CanvasFilters.svelte       |  6 ++-
 .../inspector/DefaultFilterDisplay.svelte     |  6 ++-
 .../inspector/VisualCanvasEditing.svelte      |  6 ++-
 .../filters/DimensionFiltersInput.svelte      |  6 ++-
 .../inspector/filters/TimeFiltersInput.svelte |  6 ++-
 .../canvas/state-managers/state-managers.ts   |  5 ---
 .../src/features/dashboards/selectors.ts      | 45 -------------------
 .../state-managers/state-managers.ts          |  4 --
 .../features/explores/ExploreMenuItems.svelte | 10 +++--
 .../explores/ExplorePreviewCTAs.svelte        |  5 ++-
 17 files changed, 57 insertions(+), 85 deletions(-)

diff --git a/web-common/src/features/canvas/CanvasBuilder.svelte b/web-common/src/features/canvas/CanvasBuilder.svelte
index a121bf6a4b1..c3f57950eb3 100644
--- a/web-common/src/features/canvas/CanvasBuilder.svelte
+++ b/web-common/src/features/canvas/CanvasBuilder.svelte
@@ -6,7 +6,7 @@
     type V1CanvasRow,
     type V1Resource,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { onDestroy } from "svelte";
   import { get, writable } from "svelte/store";
   import { parseDocument } from "yaml";
@@ -40,6 +40,8 @@
   export let canvasName: string;
   export let openSidebar: () => void;
 
+  const runtimeClient = useRuntimeClient();
+
   let initialMousePosition: { x: number; y: number } | null = null;
   let clientWidth: number;
   let offset = { x: 0, y: 0 };
@@ -66,7 +68,7 @@
 
   $: layoutRows = $_rows;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: components = $componentsStore;
 
diff --git a/web-common/src/features/canvas/CanvasDashboardEmbed.svelte b/web-common/src/features/canvas/CanvasDashboardEmbed.svelte
index db4fcf52060..386e63c04a2 100644
--- a/web-common/src/features/canvas/CanvasDashboardEmbed.svelte
+++ b/web-common/src/features/canvas/CanvasDashboardEmbed.svelte
@@ -2,7 +2,7 @@
   import CanvasDashboardWrapper from "./CanvasDashboardWrapper.svelte";
   import { getCanvasStore } from "./state-managers/state-managers";
   import StaticCanvasRow from "./StaticCanvasRow.svelte";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import Spinner from "../entity-management/Spinner.svelte";
   import { EntityStatus } from "../entity-management/types";
   import { derived } from "svelte/store";
@@ -14,7 +14,9 @@
   export let canvasName: string;
   export let navigationEnabled: boolean = true;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   $: ({
     canvasEntity: {
diff --git a/web-common/src/features/canvas/CanvasEditor.svelte b/web-common/src/features/canvas/CanvasEditor.svelte
index 5f1f7855aee..3eaa5dc2665 100644
--- a/web-common/src/features/canvas/CanvasEditor.svelte
+++ b/web-common/src/features/canvas/CanvasEditor.svelte
@@ -7,18 +7,20 @@
   import { mapParseErrorToLine } from "@rilldata/web-common/features/metrics-views/errors";
   import { removeCanvasStore } from "./state-managers/state-managers";
   import type { V1ParseError } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let canvasName: string;
   export let fileArtifact: FileArtifact;
   export let autoSave: boolean;
   export let parseError: V1ParseError | undefined = undefined;
 
+  const runtimeClient = useRuntimeClient();
+
   $: ({ remoteContent } = fileArtifact);
 
   let editor: EditorView;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   /** If the parse error changes, update the editor gutter. */
   $: lineStatus = mapParseErrorToLine(parseError, $remoteContent ?? "");
diff --git a/web-common/src/features/canvas/components/charts/CanvasChart.svelte b/web-common/src/features/canvas/components/charts/CanvasChart.svelte
index 549db57e3b1..4230d82a4bf 100644
--- a/web-common/src/features/canvas/components/charts/CanvasChart.svelte
+++ b/web-common/src/features/canvas/components/charts/CanvasChart.svelte
@@ -6,7 +6,7 @@
   import Spinner from "@rilldata/web-common/features/entity-management/Spinner.svelte";
   import { EntityStatus } from "@rilldata/web-common/features/entity-management/types";
   import { themeControl } from "@rilldata/web-common/features/themes/theme-control";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { derived } from "svelte/store";
   import type { CanvasChartSpec } from ".";
   import type { BaseChart } from "./BaseChart";
@@ -15,13 +15,15 @@
 
   export let component: BaseChart<CanvasChartSpec>;
 
+  const runtimeClient = useRuntimeClient();
+
   // Theme mode (light/dark) - separate from which theme is selected
   $: isThemeModeDark = derived(
     themeControl,
     ($themeControl) => $themeControl === "dark",
   );
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: ({
     specStore,
diff --git a/web-common/src/features/canvas/components/leaderboard/LeaderboardDisplay.svelte b/web-common/src/features/canvas/components/leaderboard/LeaderboardDisplay.svelte
index d95d2180d09..df27c0b7e65 100644
--- a/web-common/src/features/canvas/components/leaderboard/LeaderboardDisplay.svelte
+++ b/web-common/src/features/canvas/components/leaderboard/LeaderboardDisplay.svelte
@@ -13,7 +13,7 @@
   import { selectedDimensionValues } from "@rilldata/web-common/features/dashboards/state-managers/selectors/dimension-filters";
   import { createMeasureValueFormatter } from "@rilldata/web-common/lib/number-formatting/format-measure-value";
   import type { MetricsViewSpecMeasure } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import ComponentHeader from "../../ComponentHeader.svelte";
   import {
     getDimensionColumnWidth,
@@ -23,13 +23,15 @@
 
   export let component: LeaderboardComponent;
 
+  const runtimeClient = useRuntimeClient();
+
   let metricsViewName: string;
   let leaderboardMeasureNames: string[] = [];
   let dimensionNames: string[] = [];
   let numRows = 7;
   let leaderboardWrapperWidth = 0;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: ({
     specStore,
diff --git a/web-common/src/features/canvas/components/markdown/Markdown.svelte b/web-common/src/features/canvas/components/markdown/Markdown.svelte
index 3745a8e41d2..595e1e43e35 100644
--- a/web-common/src/features/canvas/components/markdown/Markdown.svelte
+++ b/web-common/src/features/canvas/components/markdown/Markdown.svelte
@@ -3,6 +3,7 @@
   import { marked } from "marked";
   import { createQuery } from "@tanstack/svelte-query";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { MarkdownCanvasComponent } from "./";
   import {
     getPositionClasses,
@@ -13,6 +14,8 @@
 
   export let component: MarkdownCanvasComponent;
 
+  const runtimeClient = useRuntimeClient();
+
   $: specStore = component?.specStore;
   $: spec = specStore ? $specStore : undefined;
   $: content = spec?.content ?? "";
@@ -25,7 +28,10 @@
     ? ($parentSpecStore?.data?.metricsViews ?? {})
     : {};
 
-  const queryOptionsStore = getResolveTemplatedStringQueryOptions(component);
+  const queryOptionsStore = getResolveTemplatedStringQueryOptions(
+    component,
+    runtimeClient.instanceId,
+  );
   $: resolveQuery = createQuery(queryOptionsStore, queryClient);
 
   // Store the last successfully resolved content to prevent flashing during refetches
diff --git a/web-common/src/features/canvas/components/markdown/util.ts b/web-common/src/features/canvas/components/markdown/util.ts
index b3d234d6747..4c9c130a21d 100644
--- a/web-common/src/features/canvas/components/markdown/util.ts
+++ b/web-common/src/features/canvas/components/markdown/util.ts
@@ -10,7 +10,6 @@ import type {
   QueryServiceResolveTemplatedStringBody,
 } from "@rilldata/web-common/runtime-client";
 import { getQueryServiceResolveTemplatedStringQueryOptions } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import { derived } from "svelte/store";
 import type { ParsedFilters } from "../../stores/filter-state";
 import type { Readable } from "svelte/motion";
@@ -128,6 +127,7 @@ function buildRequestBody(params: {
 
 export function getResolveTemplatedStringQueryOptions(
   component: MarkdownCanvasComponent,
+  instanceId: string,
 ): Readable<
   ReturnType<typeof getQueryServiceResolveTemplatedStringQueryOptions>
 > {
@@ -139,7 +139,6 @@ export function getResolveTemplatedStringQueryOptions(
           component.specStore,
           component.timeAndFilterStore,
           component.parent?.specStore ?? null,
-          runtime,
           component.parent.timeManager.hasTimeSeriesStore,
           ...Array.from(metricsViewFilters.values()).map((f) => f.parsed),
         ],
@@ -147,14 +146,12 @@ export function getResolveTemplatedStringQueryOptions(
           spec,
           timeAndFilters,
           parentSpec,
-          runtimeState,
           hasTimeSeries,
           ...parsedMetricsViewFilters
         ]) => {
           const content = spec?.content ?? "";
           const applyFormatting = spec?.apply_formatting === true;
           const needsTemplating = hasTemplatingSyntax(content);
-          const instanceId = runtimeState?.instanceId ?? "";
 
           const metricsViews = parentSpec?.data?.metricsViews ?? {};
 
diff --git a/web-common/src/features/canvas/filters/CanvasFilters.svelte b/web-common/src/features/canvas/filters/CanvasFilters.svelte
index c1633b7bc96..1145513b714 100644
--- a/web-common/src/features/canvas/filters/CanvasFilters.svelte
+++ b/web-common/src/features/canvas/filters/CanvasFilters.svelte
@@ -8,7 +8,7 @@
   import MeasureFilter from "@rilldata/web-common/features/dashboards/filters/measure-filters/MeasureFilter.svelte";
   import { getPanRangeForTimeRange } from "@rilldata/web-common/features/dashboards/state-managers/selectors/charts";
   import SuperPill from "@rilldata/web-common/features/dashboards/time-controls/super-pill/SuperPill.svelte";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import CanvasComparisonPill from "./CanvasComparisonPill.svelte";
   import CanvasFilterButton from "../../dashboards/filters/CanvasFilterButton.svelte";
   import { Tooltip } from "bits-ui";
@@ -19,12 +19,14 @@
   export let builder = false;
   export let canvasName: string;
 
+  const runtimeClient = useRuntimeClient();
+
   /** the height of a row of chips */
   const ROW_HEIGHT = "26px";
 
   let showDefaultItem = false;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
   $: ({
     canvasEntity: {
       filterManager: {
diff --git a/web-common/src/features/canvas/inspector/DefaultFilterDisplay.svelte b/web-common/src/features/canvas/inspector/DefaultFilterDisplay.svelte
index 2962d0001dd..edae0c35984 100644
--- a/web-common/src/features/canvas/inspector/DefaultFilterDisplay.svelte
+++ b/web-common/src/features/canvas/inspector/DefaultFilterDisplay.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { getCanvasStore } from "../state-managers/state-managers";
   import Button from "@rilldata/web-common/components/button/Button.svelte";
   import Trash from "@rilldata/web-common/components/icons/Trash.svelte";
@@ -7,7 +7,9 @@
 
   export let canvasName: string;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   $: ({
     canvasEntity: {
diff --git a/web-common/src/features/canvas/inspector/VisualCanvasEditing.svelte b/web-common/src/features/canvas/inspector/VisualCanvasEditing.svelte
index 9975c093a44..792ebf7ed0a 100644
--- a/web-common/src/features/canvas/inspector/VisualCanvasEditing.svelte
+++ b/web-common/src/features/canvas/inspector/VisualCanvasEditing.svelte
@@ -6,13 +6,15 @@
   import type { FileArtifact } from "@rilldata/web-common/features/entity-management/file-artifact";
   import { Inspector } from "@rilldata/web-common/layout/workspace";
   import { parseDocument } from "yaml";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let fileArtifact: FileArtifact;
   export let autoSave: boolean;
   export let canvasName: string;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   $: ({
     canvasEntity: { selectedComponent, componentsStore },
diff --git a/web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte b/web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte
index c527c235313..6430743afc8 100644
--- a/web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte
+++ b/web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte
@@ -4,7 +4,7 @@
   import { getCanvasStore } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
   import DimensionFilter from "@rilldata/web-common/features/dashboards/filters/dimension-filters/DimensionFilter.svelte";
   import MeasureFilter from "@rilldata/web-common/features/dashboards/filters/measure-filters/MeasureFilter.svelte";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import CanvasFilterButton from "@rilldata/web-common/features/dashboards/filters/CanvasFilterButton.svelte";
   import type { FilterState } from "../../stores/filter-state";
   import Button from "@rilldata/web-common/components/button/Button.svelte";
@@ -17,9 +17,11 @@
   export let excludedDimensions: Set<string>;
   export let updateLocalFilterString: (newFilterString: string) => void;
 
+  const runtimeClient = useRuntimeClient();
+
   let localFiltersEnabledOverride = false;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: ({
     canvasEntity: {
diff --git a/web-common/src/features/canvas/inspector/filters/TimeFiltersInput.svelte b/web-common/src/features/canvas/inspector/filters/TimeFiltersInput.svelte
index cc90fec0932..9448ef85dc1 100644
--- a/web-common/src/features/canvas/inspector/filters/TimeFiltersInput.svelte
+++ b/web-common/src/features/canvas/inspector/filters/TimeFiltersInput.svelte
@@ -4,7 +4,7 @@
   import CanvasComparisonPill from "@rilldata/web-common/features/canvas/filters/CanvasComparisonPill.svelte";
   import { getCanvasStore } from "@rilldata/web-common/features/canvas/state-managers/state-managers";
   import SuperPill from "@rilldata/web-common/features/dashboards/time-controls/super-pill/SuperPill.svelte";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { TimeState } from "../../stores/time-state";
   import { ALL_TIME_RANGE_ALIAS } from "@rilldata/web-common/features/dashboards/time-controls/new-time-controls";
 
@@ -15,7 +15,9 @@
   export let canvasName: string;
   export let metricsView: string | null;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   $: ({
     canvasEntity: {
diff --git a/web-common/src/features/canvas/state-managers/state-managers.ts b/web-common/src/features/canvas/state-managers/state-managers.ts
index bf816bbbaf5..4434a04fde7 100644
--- a/web-common/src/features/canvas/state-managers/state-managers.ts
+++ b/web-common/src/features/canvas/state-managers/state-managers.ts
@@ -1,14 +1,10 @@
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { QueryClient } from "@tanstack/svelte-query";
-import { type Writable } from "svelte/store";
 import { CanvasEntity } from "../stores/canvas-entity";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
 import type { CanvasResponse } from "../selector";
 
 export type CanvasStore = {
-  runtime: Writable<Runtime>;
   runtimeClient: RuntimeClient;
   canvasEntity: CanvasEntity;
   queryClient: QueryClient;
@@ -73,7 +69,6 @@ export function setCanvasStore(
 
   const canvasEntity = new CanvasEntity(canvasName, instanceId, response);
   const store: CanvasStore = {
-    runtime: runtime,
     runtimeClient: runtimeClient!,
     canvasEntity,
     queryClient,
diff --git a/web-common/src/features/dashboards/selectors.ts b/web-common/src/features/dashboards/selectors.ts
index df41c6c2489..3d4db58bf43 100644
--- a/web-common/src/features/dashboards/selectors.ts
+++ b/web-common/src/features/dashboards/selectors.ts
@@ -15,7 +15,6 @@ import {
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
 import {
   createRuntimeServiceListResources,
-  getQueryServiceMetricsViewSchemaQueryOptions,
   getQueryServiceMetricsViewTimeRangeQueryOptions,
   getRuntimeServiceListResourcesQueryOptions,
   type RpcStatus,
@@ -79,23 +78,6 @@ export function useValidExplores(instanceId: string) {
   );
 }
 
-export function getValidDashboardsQueryOptions() {
-  return derived(runtime, ({ instanceId }) => {
-    return getRuntimeServiceListResourcesQueryOptions(
-      instanceId,
-      {
-        kind: ResourceKind.Explore,
-      },
-      {
-        query: {
-          select: (data) =>
-            data?.resources?.filter((res) => !!res.explore?.state?.validSpec),
-        },
-      },
-    );
-  });
-}
-
 export function useValidCanvases(instanceId: string) {
   return useFilteredResources(instanceId, ResourceKind.Canvas, (data) =>
     data?.resources?.filter((res) => !!res.canvas?.state?.validSpec),
@@ -232,33 +214,6 @@ export function hasValidMetricsViewTimeRange(
   );
 }
 
-export function getMetricsViewSchemaOptions(
-  exploreNameStore: Readable<string>,
-) {
-  const validSpecQuery = createQuery(
-    getExploreValidSpecQueryOptions(exploreNameStore),
-  );
-
-  return derived(
-    [runtime, validSpecQuery],
-    ([{ instanceId }, validSpecResp]) => {
-      const exploreSpec = validSpecResp.data?.exploreSpec ?? {};
-      const metricsViewName = exploreSpec.metricsView ?? "";
-
-      return getQueryServiceMetricsViewSchemaQueryOptions(
-        instanceId,
-        metricsViewName,
-        {},
-        {
-          query: {
-            enabled: Boolean(metricsViewName),
-          },
-        },
-      );
-    },
-  );
-}
-
 export function getFiltersForOtherDimensions(
   whereFilter: V1Expression,
   dimName: string,
diff --git a/web-common/src/features/dashboards/state-managers/state-managers.ts b/web-common/src/features/dashboards/state-managers/state-managers.ts
index b0115413619..7e1fbfea013 100644
--- a/web-common/src/features/dashboards/state-managers/state-managers.ts
+++ b/web-common/src/features/dashboards/state-managers/state-managers.ts
@@ -5,8 +5,6 @@ import {
   type V1ExplorePreset,
   type V1MetricsViewTimeRangeResponse,
 } from "@rilldata/web-common/runtime-client";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createRuntimeServiceGetExplore } from "@rilldata/web-common/runtime-client/v2/gen/runtime-service";
 import { createQueryServiceMetricsViewTimeRange } from "@rilldata/web-common/runtime-client/v2/gen/query-service";
@@ -37,7 +35,6 @@ import {
 } from "../leaderboard-context-column";
 
 export type StateManagers = {
-  runtime: Writable<Runtime>;
   runtimeClient: RuntimeClient;
   metricsViewName: Writable<string>;
   exploreName: Writable<string>;
@@ -167,7 +164,6 @@ export function createStateManagers({
   );
 
   return {
-    runtime: runtime,
     runtimeClient,
     metricsViewName: metricsViewNameStore,
     exploreName: exploreNameStore,
diff --git a/web-common/src/features/explores/ExploreMenuItems.svelte b/web-common/src/features/explores/ExploreMenuItems.svelte
index 0cf9582a7db..9fa1d26ab7b 100644
--- a/web-common/src/features/explores/ExploreMenuItems.svelte
+++ b/web-common/src/features/explores/ExploreMenuItems.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts";
   import NavigationMenuItem from "@rilldata/web-common/layout/navigation/NavigationMenuItem.svelte";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useQueryClient } from "@tanstack/svelte-query";
   import { GitBranch } from "lucide-svelte";
   import { openResourceGraphQuickView } from "@rilldata/web-common/features/resource-graph/quick-view/quick-view-store";
@@ -11,10 +11,12 @@
   $: fileArtifact = fileArtifacts.getFileArtifact(filePath);
 
   const queryClient = useQueryClient();
+  const runtimeClient = useRuntimeClient();
 
-  $: ({ instanceId } = $runtime);
-
-  $: exploreQuery = fileArtifact.getResource(queryClient, instanceId);
+  $: exploreQuery = fileArtifact.getResource(
+    queryClient,
+    runtimeClient.instanceId,
+  );
   $: exploreResource = $exploreQuery.data;
 
   function viewGraph() {
diff --git a/web-common/src/features/explores/ExplorePreviewCTAs.svelte b/web-common/src/features/explores/ExplorePreviewCTAs.svelte
index ab70bcc47a1..726cd5347a2 100644
--- a/web-common/src/features/explores/ExplorePreviewCTAs.svelte
+++ b/web-common/src/features/explores/ExplorePreviewCTAs.svelte
@@ -6,7 +6,7 @@
   import GlobalDimensionSearch from "@rilldata/web-common/features/dashboards/dimension-search/GlobalDimensionSearch.svelte";
   import { useExplore } from "@rilldata/web-common/features/explores/selectors";
   import { Button } from "../../components/button";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import ChatToggle from "../chat/layouts/sidebar/ChatToggle.svelte";
   import ViewAsButton from "../dashboards/granular-access-policies/ViewAsButton.svelte";
   import {
@@ -18,7 +18,8 @@
 
   export let exploreName: string;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+  $: ({ instanceId } = runtimeClient);
 
   $: exploreQuery = useExplore(instanceId, exploreName);
   $: exploreFilePath = $exploreQuery.data?.explore?.meta?.filePaths?.[0] ?? "";

From 5947503b23f3459b416cb4aa38ed59ddc8292c4b Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Tue, 24 Feb 2026 21:29:38 +0300
Subject: [PATCH 24/27] refactor: thread `RuntimeClient` through `.ts` query
 factories and remove dead code

Migrate leaf query option factories, intermediate callers, and module-level
singletons to accept `client: RuntimeClient` instead of reading the global
`runtime` store. Delete dead code (`getCanvasQueryOptions`, `utils.ts`).
Chat context functions updated as necessary follow-through from leaf factory
signature changes.
---
 .../bookmarks/ExploreBookmarks.svelte         | 17 +++--
 ...xplore-bookmark-legacy-data-transformer.ts |  6 +-
 web-common/src/features/canvas/selector.ts    | 36 ---------
 .../src/features/chat/DashboardChat.svelte    |  9 ++-
 .../chat/core/context/InlineContext.svelte    |  4 +-
 .../features/chat/core/context/metadata.ts    | 12 +--
 .../context/picker/ExpandableOption.svelte    |  5 +-
 .../context/picker/InlineContextPicker.svelte |  9 ++-
 .../core/context/picker/SimpleOption.svelte   |  5 +-
 .../chat/core/context/picker/data/index.ts    |  6 +-
 .../core/context/picker/data/metrics-views.ts |  9 ++-
 .../chat/core/context/picker/filters.ts       |  8 +-
 .../src/features/dashboards/chat-context.ts   | 34 +++++----
 .../src/features/dashboards/nav-utils.ts      |  5 +-
 .../src/features/dashboards/selectors.ts      | 64 +++++++---------
 .../get-explore-state-from-yaml-config.ts     |  6 +-
 .../src/features/dashboards/stores/utils.ts   | 75 -------------------
 .../time-controls/time-control-store.ts       |  6 +-
 .../get-rill-default-explore-url-params.ts    |  6 +-
 web-common/src/features/explores/selectors.ts |  7 +-
 20 files changed, 133 insertions(+), 196 deletions(-)
 delete mode 100644 web-common/src/features/dashboards/stores/utils.ts

diff --git a/web-admin/src/features/bookmarks/ExploreBookmarks.svelte b/web-admin/src/features/bookmarks/ExploreBookmarks.svelte
index e7c311d3caf..ea994fef3fb 100644
--- a/web-admin/src/features/bookmarks/ExploreBookmarks.svelte
+++ b/web-admin/src/features/bookmarks/ExploreBookmarks.svelte
@@ -10,9 +10,12 @@
   import { createUrlForExploreYAMLDefaultState } from "@rilldata/web-common/features/dashboards/stores/get-explore-state-from-yaml-config.ts";
   import { createRillDefaultExploreUrlParamsV2 } from "@rilldata/web-common/features/dashboards/url-state/get-rill-default-explore-url-params.ts";
   import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors.ts";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { createQuery } from "@tanstack/svelte-query";
   import { writable } from "svelte/store";
 
+  const runtimeClient = useRuntimeClient();
+
   export let organization: string;
   export let project: string;
   export let metricsViewName: string;
@@ -26,17 +29,21 @@
 
   // Get url params for the explore based on yaml defaults.
   // This is used for home bookmarks button when there is no explicit home bookmark created.
-  const urlForExploreYAMLDefaultState =
-    createUrlForExploreYAMLDefaultState(exploreNameStore);
+  const urlForExploreYAMLDefaultState = createUrlForExploreYAMLDefaultState(
+    runtimeClient,
+    exploreNameStore,
+  );
 
   // Rill opinionated url params that are removed from url to keep the url short.
   // To keep bookmarks exhaustive, these are added on top of current url params while creating bookmarks.
-  const rillDefaultExploreURLParams =
-    createRillDefaultExploreUrlParamsV2(exploreNameStore);
+  const rillDefaultExploreURLParams = createRillDefaultExploreUrlParamsV2(
+    runtimeClient,
+    exploreNameStore,
+  );
 
   // Transformer for legacy bookmark data that was stored in proto format.
   const exploreBookmarkLegacyDataTransformer =
-    createExploreBookmarkLegacyDataTransformer(exploreNameStore);
+    createExploreBookmarkLegacyDataTransformer(runtimeClient, exploreNameStore);
 
   // Stable query object for bookmarks for this explore
   const bookmarksQuery = createQuery(
diff --git a/web-admin/src/features/bookmarks/explore-bookmark-legacy-data-transformer.ts b/web-admin/src/features/bookmarks/explore-bookmark-legacy-data-transformer.ts
index 25c53719e85..3ed06291a64 100644
--- a/web-admin/src/features/bookmarks/explore-bookmark-legacy-data-transformer.ts
+++ b/web-admin/src/features/bookmarks/explore-bookmark-legacy-data-transformer.ts
@@ -3,6 +3,7 @@ import { getMetricsViewTimeRangeFromExploreQueryOptions } from "@rilldata/web-co
 import { getTimeControlState } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store.ts";
 import { convertPartialExploreStateToUrlParams } from "@rilldata/web-common/features/dashboards/url-state/convert-partial-explore-state-to-url-params.ts";
 import { getExploreValidSpecQueryOptions } from "@rilldata/web-common/features/explores/selectors.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type {
   V1ExploreSpec,
   V1MetricsViewSpec,
@@ -12,13 +13,14 @@ import { createQuery } from "@tanstack/svelte-query";
 import { derived, type Readable } from "svelte/store";
 
 export function createExploreBookmarkLegacyDataTransformer(
+  client: RuntimeClient,
   exploreNameStore: Readable<string>,
 ) {
   const validSpecQuery = createQuery(
-    getExploreValidSpecQueryOptions(exploreNameStore),
+    getExploreValidSpecQueryOptions(client, exploreNameStore),
   );
   const timeRangeQuery = createQuery(
-    getMetricsViewTimeRangeFromExploreQueryOptions(exploreNameStore),
+    getMetricsViewTimeRangeFromExploreQueryOptions(client, exploreNameStore),
   );
 
   return derived(
diff --git a/web-common/src/features/canvas/selector.ts b/web-common/src/features/canvas/selector.ts
index b42eac3c4e1..ecd092e461d 100644
--- a/web-common/src/features/canvas/selector.ts
+++ b/web-common/src/features/canvas/selector.ts
@@ -4,7 +4,6 @@ import {
 } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import {
   createQueryServiceResolveCanvas,
-  getQueryServiceResolveCanvasQueryOptions,
   type RpcStatus,
   type V1CanvasSpec,
   type V1MetricsView,
@@ -12,14 +11,11 @@ import {
   type V1ResolveCanvasResponseResolvedComponents,
 } from "@rilldata/web-common/runtime-client";
 import type { ErrorType } from "@rilldata/web-common/runtime-client/http-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
 import type {
   CreateQueryOptions,
   CreateQueryResult,
   QueryClient,
 } from "@tanstack/svelte-query";
-import { derived, type Readable } from "svelte/store";
-
 /**
  * Returns the default metrics view for a given instance, prioritizing in order:
  * 1. A specific metrics view by name if provided
@@ -132,35 +128,3 @@ export function useCanvas(
     queryClient,
   );
 }
-
-export function getCanvasQueryOptions(canvasNameStore: Readable<string>) {
-  return derived([runtime, canvasNameStore], ([{ instanceId }, canvasName]) =>
-    getQueryServiceResolveCanvasQueryOptions(
-      instanceId,
-      canvasName,
-      {},
-      {
-        query: {
-          select: (data) => {
-            const metricsViews: Record<string, V1MetricsView | undefined> = {};
-            const refMetricsViews = data?.referencedMetricsViews;
-            if (refMetricsViews) {
-              Object.keys(refMetricsViews).forEach((key) => {
-                metricsViews[key] = refMetricsViews?.[key]?.metricsView;
-              });
-            }
-
-            return {
-              canvas: data.canvas?.canvas?.state?.validSpec,
-              components: data.resolvedComponents,
-              metricsViews,
-              filePath: data.canvas?.meta?.filePaths?.[0],
-            };
-          },
-
-          enabled: !!canvasName,
-        },
-      },
-    ),
-  );
-}
diff --git a/web-common/src/features/chat/DashboardChat.svelte b/web-common/src/features/chat/DashboardChat.svelte
index 56766ed426f..a18fe0e98d4 100644
--- a/web-common/src/features/chat/DashboardChat.svelte
+++ b/web-common/src/features/chat/DashboardChat.svelte
@@ -2,17 +2,22 @@
   import { featureFlags } from "../feature-flags";
   import SidebarChat from "./layouts/sidebar/SidebarChat.svelte";
   import { chatOpen } from "./layouts/sidebar/sidebar-store";
-  import { dashboardChatConfig } from "@rilldata/web-common/features/dashboards/chat-context.ts";
+  import { createDashboardChatConfig } from "@rilldata/web-common/features/dashboards/chat-context.ts";
   import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors.ts";
   import { canvasChatConfig } from "@rilldata/web-common/features/canvas/chat-context.ts";
   import ThemeProvider from "@rilldata/web-common/features/dashboards/ThemeProvider.svelte";
   import { activeDashboardTheme } from "@rilldata/web-common/features/themes/active-dashboard-theme";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+
+  const runtimeClient = useRuntimeClient();
 
   export let kind: ResourceKind.Explore | ResourceKind.Canvas =
     ResourceKind.Explore;
 
   $: chatConfig =
-    kind === ResourceKind.Explore ? dashboardChatConfig : canvasChatConfig;
+    kind === ResourceKind.Explore
+      ? createDashboardChatConfig(runtimeClient)
+      : canvasChatConfig;
 
   const { dashboardChat } = featureFlags;
 </script>
diff --git a/web-common/src/features/chat/core/context/InlineContext.svelte b/web-common/src/features/chat/core/context/InlineContext.svelte
index cb5b61e45ca..73c8f68ea62 100644
--- a/web-common/src/features/chat/core/context/InlineContext.svelte
+++ b/web-common/src/features/chat/core/context/InlineContext.svelte
@@ -6,6 +6,7 @@
   import { type InlineContext } from "@rilldata/web-common/features/chat/core/context/inline-context.ts";
   import InlineContextPicker from "@rilldata/web-common/features/chat/core/context/picker/InlineContextPicker.svelte";
   import { InlineContextConfig } from "@rilldata/web-common/features/chat/core/context/config.ts";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   type InlineContextReadonlyProps = {
     mode: "readonly";
@@ -25,7 +26,8 @@
   let open = false;
   let tooltipOpen = false;
 
-  const contextMetadataStore = getInlineChatContextMetadata();
+  const runtimeClient = useRuntimeClient();
+  const contextMetadataStore = getInlineChatContextMetadata(runtimeClient);
 
   $: typeConfig = selectedChatContext.type
     ? InlineContextConfig[selectedChatContext.type]
diff --git a/web-common/src/features/chat/core/context/metadata.ts b/web-common/src/features/chat/core/context/metadata.ts
index 65d5261bc6b..329a51cd234 100644
--- a/web-common/src/features/chat/core/context/metadata.ts
+++ b/web-common/src/features/chat/core/context/metadata.ts
@@ -1,7 +1,7 @@
 import { createQuery } from "@tanstack/svelte-query";
 import { getValidMetricsViewsQueryOptions } from "@rilldata/web-common/features/dashboards/selectors.ts";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.ts";
-import { derived, get, type Readable } from "svelte/store";
+import { derived, type Readable } from "svelte/store";
 import {
   createQueryServiceResolveCanvas,
   type MetricsViewSpecDimension,
@@ -14,7 +14,7 @@ import {
   getClientFilteredResourcesQueryOptions,
   ResourceKind,
 } from "@rilldata/web-common/features/entity-management/resource-selectors.ts";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
 /**
  * Metadata used to map a value to a label.
@@ -34,9 +34,11 @@ export type MetricsViewMetadata = {
  * Creates a store that contains a map of metrics view names to their metadata.
  * Each metrics view metadata has a reference to its spec, and a map of for measure and dimension spec by their names.
  */
-export function getInlineChatContextMetadata(): Readable<InlineContextMetadata> {
+export function getInlineChatContextMetadata(
+  client: RuntimeClient,
+): Readable<InlineContextMetadata> {
   const metricsViewsQuery = createQuery(
-    getValidMetricsViewsQueryOptions(),
+    getValidMetricsViewsQueryOptions(client),
     queryClient,
   );
 
@@ -47,7 +49,7 @@ export function getInlineChatContextMetadata(): Readable<InlineContextMetadata>
     queryClient,
   );
 
-  const instanceId = get(runtime).instanceId;
+  const instanceId = client.instanceId;
 
   return derived(
     [metricsViewsQuery, canvasResourcesQuery],
diff --git a/web-common/src/features/chat/core/context/picker/ExpandableOption.svelte b/web-common/src/features/chat/core/context/picker/ExpandableOption.svelte
index cb95a5d6a49..2c47b08ce1c 100644
--- a/web-common/src/features/chat/core/context/picker/ExpandableOption.svelte
+++ b/web-common/src/features/chat/core/context/picker/ExpandableOption.svelte
@@ -15,6 +15,7 @@
   import DelayedSpinner from "@rilldata/web-common/features/entity-management/DelayedSpinner.svelte";
   import SimpleOption from "@rilldata/web-common/features/chat/core/context/picker/SimpleOption.svelte";
   import { getInlineChatContextMetadata } from "@rilldata/web-common/features/chat/core/context/metadata.ts";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let node: PickerTreeNode;
   export let selectedChatContext: InlineContext | null;
@@ -27,9 +28,11 @@
   const item = node.item;
   const context = item.context;
 
+  const runtimeClient = useRuntimeClient();
+
   const typeConfig = InlineContextConfig[context.type];
   const typeLabel = typeConfig.typeLabel;
-  const contextMetadataStore = getInlineChatContextMetadata();
+  const contextMetadataStore = getInlineChatContextMetadata(runtimeClient);
   $: icon = typeConfig?.getIcon?.(context, $contextMetadataStore);
   const selectedItemId = selectedChatContext
     ? getIdForContext(selectedChatContext)
diff --git a/web-common/src/features/chat/core/context/picker/InlineContextPicker.svelte b/web-common/src/features/chat/core/context/picker/InlineContextPicker.svelte
index 248d8f44027..4319a37280e 100644
--- a/web-common/src/features/chat/core/context/picker/InlineContextPicker.svelte
+++ b/web-common/src/features/chat/core/context/picker/InlineContextPicker.svelte
@@ -21,6 +21,7 @@
   import { KeyboardNavigationManager } from "@rilldata/web-common/features/chat/core/context/picker/keyboard-navigation.ts";
   import ExpandableOption from "@rilldata/web-common/features/chat/core/context/picker/ExpandableOption.svelte";
   import SimpleOption from "@rilldata/web-common/features/chat/core/context/picker/SimpleOption.svelte";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let selectedChatContext: InlineContext | null = null;
   export let searchText: string = "";
@@ -32,12 +33,18 @@
     ? getIdForContext(selectedChatContext)
     : null;
 
+  const runtimeClient = useRuntimeClient();
+
   const searchTextStore = writable("");
   $: searchTextStore.set(searchText.replace(/^@/, ""));
 
   const uiState = new ContextPickerUIState();
   const expandedParentsStore = uiState.expandedParentsStore;
-  const filteredOptions = getFilteredPickerItems(uiState, searchTextStore);
+  const filteredOptions = getFilteredPickerItems(
+    runtimeClient,
+    uiState,
+    searchTextStore,
+  );
   $: pickerTree = buildPickerTree($filteredOptions);
 
   const keyboardNavigationManager = new KeyboardNavigationManager(uiState);
diff --git a/web-common/src/features/chat/core/context/picker/SimpleOption.svelte b/web-common/src/features/chat/core/context/picker/SimpleOption.svelte
index a4bc78d4c4b..c025dd479a7 100644
--- a/web-common/src/features/chat/core/context/picker/SimpleOption.svelte
+++ b/web-common/src/features/chat/core/context/picker/SimpleOption.svelte
@@ -8,14 +8,17 @@
   import { CheckIcon } from "lucide-svelte";
   import type { PickerItem } from "@rilldata/web-common/features/chat/core/context/picker/picker-tree.ts";
   import { getInlineChatContextMetadata } from "@rilldata/web-common/features/chat/core/context/metadata.ts";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let item: PickerItem;
   export let selectedChatContext: InlineContext | null;
   export let keyboardNavigationManager: KeyboardNavigationManager;
   export let onSelect: (ctx: InlineContext) => void;
 
+  const runtimeClient = useRuntimeClient();
+
   const typeConfig = InlineContextConfig[item.context.type];
-  const contextMetadataStore = getInlineChatContextMetadata();
+  const contextMetadataStore = getInlineChatContextMetadata(runtimeClient);
   $: icon = typeConfig?.getIcon?.(item.context, $contextMetadataStore);
   const selectedItemId = selectedChatContext
     ? getIdForContext(selectedChatContext)
diff --git a/web-common/src/features/chat/core/context/picker/data/index.ts b/web-common/src/features/chat/core/context/picker/data/index.ts
index e4ef37500a2..c67f5a4c903 100644
--- a/web-common/src/features/chat/core/context/picker/data/index.ts
+++ b/web-common/src/features/chat/core/context/picker/data/index.ts
@@ -7,6 +7,7 @@ import type { PickerItem } from "@rilldata/web-common/features/chat/core/context
 import { getCanvasesPickerOptions } from "@rilldata/web-common/features/chat/core/context/picker/data/canvases.ts";
 import { getInlineChatContextMetadata } from "@rilldata/web-common/features/chat/core/context/metadata.ts";
 import { InlineContextConfig } from "@rilldata/web-common/features/chat/core/context/config.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
 /**
  * Creates a store that contains a list of options for each valid metrics view, canvases and sources/models.
@@ -17,14 +18,15 @@ import { InlineContextConfig } from "@rilldata/web-common/features/chat/core/con
  * The list contains parents immediately followed by their children.
  */
 export function getPickerOptions(
+  client: RuntimeClient,
   uiState: ContextPickerUIState,
 ): Readable<PickerItem[]> {
   const isRillDev = !get(featureFlags.adminServer);
 
   return derived(
     [
-      getInlineChatContextMetadata(),
-      getMetricsViewPickerOptions(),
+      getInlineChatContextMetadata(client),
+      getMetricsViewPickerOptions(client),
       getCanvasesPickerOptions(uiState),
       isRillDev ? getModelsPickerOptions(uiState) : readable(null),
       uiState.expandedParentsStore,
diff --git a/web-common/src/features/chat/core/context/picker/data/metrics-views.ts b/web-common/src/features/chat/core/context/picker/data/metrics-views.ts
index d8d5f58d89a..4f46b44e7dd 100644
--- a/web-common/src/features/chat/core/context/picker/data/metrics-views.ts
+++ b/web-common/src/features/chat/core/context/picker/data/metrics-views.ts
@@ -1,6 +1,7 @@
 import { getActiveMetricsViewNameStore } from "@rilldata/web-common/features/dashboards/nav-utils.ts";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.ts";
 import { getValidMetricsViewsQueryOptions } from "@rilldata/web-common/features/dashboards/selectors.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { derived, type Readable } from "svelte/store";
 import { createQuery } from "@tanstack/svelte-query";
 import {
@@ -17,14 +18,16 @@ import { getLatestConversationQueryOptions } from "@rilldata/web-common/features
  * 1st level: metrics view context options
  * 2nd level: measures and dimensions options for each metrics view
  */
-export function getMetricsViewPickerOptions(): Readable<PickerItem[]> {
+export function getMetricsViewPickerOptions(
+  client: RuntimeClient,
+): Readable<PickerItem[]> {
   const metricsViewsQuery = createQuery(
-    getValidMetricsViewsQueryOptions(),
+    getValidMetricsViewsQueryOptions(client),
     queryClient,
   );
 
   const lastUsedMetricsViewStore = getLastUsedMetricsViewNameStore();
-  const activeMetricsViewStore = getActiveMetricsViewNameStore();
+  const activeMetricsViewStore = getActiveMetricsViewNameStore(client);
 
   return derived(
     [metricsViewsQuery, lastUsedMetricsViewStore, activeMetricsViewStore],
diff --git a/web-common/src/features/chat/core/context/picker/filters.ts b/web-common/src/features/chat/core/context/picker/filters.ts
index 18e34c57af0..299811a2388 100644
--- a/web-common/src/features/chat/core/context/picker/filters.ts
+++ b/web-common/src/features/chat/core/context/picker/filters.ts
@@ -2,6 +2,7 @@ import { ContextPickerUIState } from "@rilldata/web-common/features/chat/core/co
 import { derived, type Readable } from "svelte/store";
 import { getPickerOptions } from "@rilldata/web-common/features/chat/core/context/picker/data";
 import type { PickerItem } from "@rilldata/web-common/features/chat/core/context/picker/picker-tree.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
 /**
  * Creates a store that contains a list of options that match the search text.
@@ -10,11 +11,16 @@ import type { PickerItem } from "@rilldata/web-common/features/chat/core/context
  * 3. If any child options are present, retains the parent option as well.
  */
 export function getFilteredPickerItems(
+  client: RuntimeClient,
   uiState: ContextPickerUIState,
   searchTextStore: Readable<string>,
 ) {
   return derived(
-    [getPickerOptions(uiState), searchTextStore, uiState.expandedParentsStore],
+    [
+      getPickerOptions(client, uiState),
+      searchTextStore,
+      uiState.expandedParentsStore,
+    ],
     ([options, searchText, expandedParents]) => {
       const filterFunction = (label: string, value: string) =>
         searchText.length === 0 ||
diff --git a/web-common/src/features/dashboards/chat-context.ts b/web-common/src/features/dashboards/chat-context.ts
index d63d436ce7c..bba6ad8b1bb 100644
--- a/web-common/src/features/dashboards/chat-context.ts
+++ b/web-common/src/features/dashboards/chat-context.ts
@@ -10,31 +10,35 @@ import type {
   RuntimeServiceCompleteBody,
   V1AnalystAgentContext,
 } from "@rilldata/web-common/runtime-client";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { derived, type Readable } from "svelte/store";
 
-const activeExploreContextStore = getActiveExploreContext();
-
-export const dashboardChatConfig = {
-  agent: ToolName.ANALYST_AGENT,
-  additionalContextStoreGetter: () => activeExploreContextStore, // TODO: add canvas context as well
-  emptyChatLabel: "Happy to help explore your data",
-  placeholder:
-    "Type a question, or press @ to insert a metric, dimension, or measure.",
-  minChatHeight: "min-h-[4rem]",
-} satisfies ChatConfig;
+export function createDashboardChatConfig(client: RuntimeClient): ChatConfig {
+  const activeExploreContextStore = getActiveExploreContext(client);
+  return {
+    agent: ToolName.ANALYST_AGENT,
+    additionalContextStoreGetter: () => activeExploreContextStore,
+    emptyChatLabel: "Happy to help explore your data",
+    placeholder:
+      "Type a question, or press @ to insert a metric, dimension, or measure.",
+    minChatHeight: "min-h-[4rem]",
+  };
+}
 
 /**
  * Creates a store that contains the active explore context sent to the Complete API.
  * It returns RuntimeServiceCompleteBody with V1AnalystAgentContext that is passed to the API.
  */
-function getActiveExploreContext(): Readable<
-  Partial<RuntimeServiceCompleteBody>
-> {
+function getActiveExploreContext(
+  client: RuntimeClient,
+): Readable<Partial<RuntimeServiceCompleteBody>> {
   const exploreNameStore = getExploreNameStore();
 
   const exploreState = useStableExploreState(exploreNameStore);
-  const timeControlsStore =
-    createStableTimeControlStoreFromName(exploreNameStore);
+  const timeControlsStore = createStableTimeControlStoreFromName(
+    client,
+    exploreNameStore,
+  );
 
   return derived(
     [exploreNameStore, exploreState, timeControlsStore],
diff --git a/web-common/src/features/dashboards/nav-utils.ts b/web-common/src/features/dashboards/nav-utils.ts
index 1fa05aa7775..c19aea7ff8c 100644
--- a/web-common/src/features/dashboards/nav-utils.ts
+++ b/web-common/src/features/dashboards/nav-utils.ts
@@ -3,6 +3,7 @@ import { ResourceKind } from "@rilldata/web-common/features/entity-management/re
 import type { Page } from "@sveltejs/kit";
 import { derived } from "svelte/store";
 import { getExploreValidSpecQueryOptions } from "@rilldata/web-common/features/explores/selectors.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createQuery } from "@tanstack/svelte-query";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.ts";
 
@@ -53,10 +54,10 @@ export function getCanvasNameStore() {
   });
 }
 
-export function getActiveMetricsViewNameStore() {
+export function getActiveMetricsViewNameStore(client: RuntimeClient) {
   const exploreNameStore = getExploreNameStore();
   const validSpecQuery = createQuery(
-    getExploreValidSpecQueryOptions(exploreNameStore),
+    getExploreValidSpecQueryOptions(client, exploreNameStore),
     queryClient,
   );
 
diff --git a/web-common/src/features/dashboards/selectors.ts b/web-common/src/features/dashboards/selectors.ts
index 3d4db58bf43..1e6238ae361 100644
--- a/web-common/src/features/dashboards/selectors.ts
+++ b/web-common/src/features/dashboards/selectors.ts
@@ -24,7 +24,7 @@ import {
   type V1MetricsViewTimeRangeResponse,
   type V1Resource,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import {
   createQuery,
   type CreateQueryOptions,
@@ -52,23 +52,19 @@ export function useMetricsView(
   );
 }
 
-export function getValidMetricsViewsQueryOptions() {
-  return derived(runtime, ({ instanceId }) => {
-    return getRuntimeServiceListResourcesQueryOptions(
-      instanceId,
-      {
-        kind: ResourceKind.MetricsView,
-      },
-      {
-        query: {
-          select: (data) =>
-            data?.resources?.filter(
-              (res) => !!res.metricsView?.state?.validSpec,
-            ),
-        },
+export function getValidMetricsViewsQueryOptions(client: RuntimeClient) {
+  return getRuntimeServiceListResourcesQueryOptions(
+    client.instanceId,
+    {
+      kind: ResourceKind.MetricsView,
+    },
+    {
+      query: {
+        select: (data) =>
+          data?.resources?.filter((res) => !!res.metricsView?.state?.validSpec),
       },
-    );
-  });
+    },
+  );
 }
 
 export function useValidExplores(instanceId: string) {
@@ -152,32 +148,30 @@ export function useMetricsViewTimeRange(
 }
 
 export function getMetricsViewTimeRangeFromExploreQueryOptions(
+  client: RuntimeClient,
   exploreNameStore: Readable<string>,
 ) {
   const validSpecQuery = createQuery(
-    getExploreValidSpecQueryOptions(exploreNameStore),
+    getExploreValidSpecQueryOptions(client, exploreNameStore),
     queryClient,
   );
 
-  return derived(
-    [runtime, validSpecQuery],
-    ([{ instanceId }, validSpecResp]) => {
-      const metricsViewSpec = validSpecResp.data?.metricsViewSpec ?? {};
-      const exploreSpec = validSpecResp.data?.exploreSpec ?? {};
-      const metricsViewName = exploreSpec.metricsView ?? "";
+  return derived([validSpecQuery], ([validSpecResp]) => {
+    const metricsViewSpec = validSpecResp.data?.metricsViewSpec ?? {};
+    const exploreSpec = validSpecResp.data?.exploreSpec ?? {};
+    const metricsViewName = exploreSpec.metricsView ?? "";
 
-      return getQueryServiceMetricsViewTimeRangeQueryOptions(
-        instanceId,
-        metricsViewName,
-        {},
-        {
-          query: {
-            enabled: !!metricsViewSpec.timeDimension,
-          },
+    return getQueryServiceMetricsViewTimeRangeQueryOptions(
+      client.instanceId,
+      metricsViewName,
+      {},
+      {
+        query: {
+          enabled: !!metricsViewSpec.timeDimension,
         },
-      );
-    },
-  );
+      },
+    );
+  });
 }
 
 export function hasValidMetricsViewTimeRange(
diff --git a/web-common/src/features/dashboards/stores/get-explore-state-from-yaml-config.ts b/web-common/src/features/dashboards/stores/get-explore-state-from-yaml-config.ts
index a436ad9db1e..6a6c9add412 100644
--- a/web-common/src/features/dashboards/stores/get-explore-state-from-yaml-config.ts
+++ b/web-common/src/features/dashboards/stores/get-explore-state-from-yaml-config.ts
@@ -7,6 +7,7 @@ import { getValidComparisonOption } from "@rilldata/web-common/features/dashboar
 import { convertPartialExploreStateToUrlParams } from "@rilldata/web-common/features/dashboards/url-state/convert-partial-explore-state-to-url-params";
 import { ToLegacySortTypeMap } from "@rilldata/web-common/features/dashboards/url-state/legacyMappers";
 import { getExploreValidSpecQueryOptions } from "@rilldata/web-common/features/explores/selectors";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { arrayUnorderedEquals } from "@rilldata/web-common/lib/arrayUtils";
 import { ISODurationToTimePreset } from "@rilldata/web-common/lib/time/ranges";
 import { isoDurationToFullTimeRange } from "@rilldata/web-common/lib/time/ranges/iso-ranges";
@@ -47,13 +48,14 @@ export function getExploreStateFromYAMLConfig(
 }
 
 export function createUrlForExploreYAMLDefaultState(
+  client: RuntimeClient,
   exploreNameStore: Readable<string>,
 ) {
   const validSpecQuery = createQuery(
-    getExploreValidSpecQueryOptions(exploreNameStore),
+    getExploreValidSpecQueryOptions(client, exploreNameStore),
   );
   const timeRangeQuery = createQuery(
-    getMetricsViewTimeRangeFromExploreQueryOptions(exploreNameStore),
+    getMetricsViewTimeRangeFromExploreQueryOptions(client, exploreNameStore),
   );
 
   return derived(
diff --git a/web-common/src/features/dashboards/stores/utils.ts b/web-common/src/features/dashboards/stores/utils.ts
deleted file mode 100644
index 2a946dd165e..00000000000
--- a/web-common/src/features/dashboards/stores/utils.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { getMetricsViewTimeRangeFromExploreQueryOptions } from "@rilldata/web-common/features/dashboards/selectors.ts";
-import { metricsExplorerStore } from "@rilldata/web-common/features/dashboards/stores/dashboard-stores.ts";
-import { createAndExpression } from "@rilldata/web-common/features/dashboards/stores/filter-utils.ts";
-import type { FiltersState } from "@rilldata/web-common/features/dashboards/stores/Filters.ts";
-import type { TimeControlState } from "@rilldata/web-common/features/dashboards/stores/TimeControls.ts";
-import { getTimeControlState } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store.ts";
-import { getExploreValidSpecQueryOptions } from "@rilldata/web-common/features/explores/selectors.ts";
-import { createQuery } from "@tanstack/svelte-query";
-import { derived, type Readable } from "svelte/store";
-
-export function getFilterStateFromNameStore(
-  exploreNameStore: Readable<string>,
-): Readable<FiltersState> {
-  return derived(
-    [metricsExplorerStore, exploreNameStore],
-    ([metricsExplorerState, exploreName]) => {
-      const exploreState = metricsExplorerState.entities[exploreName];
-      const filtersState: FiltersState = {
-        whereFilter: exploreState?.whereFilter ?? createAndExpression([]),
-        dimensionThresholdFilters:
-          exploreState?.dimensionThresholdFilters ?? [],
-        dimensionsWithInlistFilter:
-          exploreState?.dimensionsWithInlistFilter ?? [],
-        dimensionFilterExcludeMode:
-          exploreState?.dimensionFilterExcludeMode ?? new Map(),
-      };
-
-      return filtersState;
-    },
-  );
-}
-
-export function getTimeControlsStateFromNameStore(
-  exploreNameStore: Readable<string>,
-) {
-  const validSpecQuery = createQuery(
-    getExploreValidSpecQueryOptions(exploreNameStore),
-  );
-  const metricsViewTimeRangeQuery = createQuery(
-    getMetricsViewTimeRangeFromExploreQueryOptions(exploreNameStore),
-  );
-
-  return derived(
-    [
-      metricsExplorerStore,
-      exploreNameStore,
-      validSpecQuery,
-      metricsViewTimeRangeQuery,
-    ],
-    ([metricsExplorerState, exploreName, validSpecResp, timeRangeResp]) => {
-      const exploreState = metricsExplorerState.entities[exploreName];
-      const metricsViewSpec = validSpecResp.data?.metricsViewSpec ?? {};
-      const exploreSpec = validSpecResp.data?.exploreSpec ?? {};
-      const timeRangeSummary = timeRangeResp.data?.timeRangeSummary;
-
-      const exploreTimeControlState = exploreState
-        ? getTimeControlState(
-            metricsViewSpec,
-            exploreSpec,
-            timeRangeSummary,
-            exploreState,
-          )
-        : undefined;
-      const timeControlState = <TimeControlState>{
-        selectedTimeRange: exploreTimeControlState?.selectedTimeRange,
-        selectedComparisonTimeRange:
-          exploreTimeControlState?.selectedComparisonTimeRange,
-        showTimeComparison: exploreTimeControlState?.showTimeComparison,
-        selectedTimezone: exploreState?.selectedTimezone,
-      };
-
-      return timeControlState;
-    },
-  );
-}
diff --git a/web-common/src/features/dashboards/time-controls/time-control-store.ts b/web-common/src/features/dashboards/time-controls/time-control-store.ts
index ef3070db980..79e57ebdd7c 100644
--- a/web-common/src/features/dashboards/time-controls/time-control-store.ts
+++ b/web-common/src/features/dashboards/time-controls/time-control-store.ts
@@ -14,6 +14,7 @@ import {
   getExploreValidSpecQueryOptions,
   useExploreValidSpec,
 } from "@rilldata/web-common/features/explores/selectors";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
 import {
   getComparionRangeForScrub,
@@ -266,14 +267,15 @@ export function createTimeControlStoreFromName(
 }
 
 export function createStableTimeControlStoreFromName(
+  client: RuntimeClient,
   exploreNameStore: Readable<string>,
 ) {
   const validSpecQuery = createQuery(
-    getExploreValidSpecQueryOptions(exploreNameStore),
+    getExploreValidSpecQueryOptions(client, exploreNameStore),
     queryClient,
   );
   const metricsViewTimeRangeQuery = createQuery(
-    getMetricsViewTimeRangeFromExploreQueryOptions(exploreNameStore),
+    getMetricsViewTimeRangeFromExploreQueryOptions(client, exploreNameStore),
     queryClient,
   );
   const exploreStore = useStableExploreState(exploreNameStore);
diff --git a/web-common/src/features/dashboards/url-state/get-rill-default-explore-url-params.ts b/web-common/src/features/dashboards/url-state/get-rill-default-explore-url-params.ts
index 5da95a9b39d..5e19521484b 100644
--- a/web-common/src/features/dashboards/url-state/get-rill-default-explore-url-params.ts
+++ b/web-common/src/features/dashboards/url-state/get-rill-default-explore-url-params.ts
@@ -10,6 +10,7 @@ import {
   getExploreValidSpecQueryOptions,
   useExploreValidSpec,
 } from "@rilldata/web-common/features/explores/selectors";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import {
   type V1ExploreSpec,
   type V1MetricsViewSpec,
@@ -80,13 +81,14 @@ export function createRillDefaultExploreUrlParams(
  * TODO: replace {@link createRillDefaultExploreUrlParams} with this
  */
 export function createRillDefaultExploreUrlParamsV2(
+  client: RuntimeClient,
   exploreNameStore: Readable<string>,
 ) {
   const validSpecQuery = createQuery(
-    getExploreValidSpecQueryOptions(exploreNameStore),
+    getExploreValidSpecQueryOptions(client, exploreNameStore),
   );
   const timeRangeQuery = createQuery(
-    getMetricsViewTimeRangeFromExploreQueryOptions(exploreNameStore),
+    getMetricsViewTimeRangeFromExploreQueryOptions(client, exploreNameStore),
   );
 
   return derived(
diff --git a/web-common/src/features/explores/selectors.ts b/web-common/src/features/explores/selectors.ts
index b1dc56c2e35..39cba132490 100644
--- a/web-common/src/features/explores/selectors.ts
+++ b/web-common/src/features/explores/selectors.ts
@@ -1,4 +1,4 @@
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import {
   type CreateQueryOptions,
   type QueryFunction,
@@ -77,11 +77,12 @@ export function useExploreValidSpec(
 }
 
 export function getExploreValidSpecQueryOptions(
+  client: RuntimeClient,
   exploreNameStore: Readable<string>,
 ) {
-  return derived([runtime, exploreNameStore], ([{ instanceId }, exploreName]) =>
+  return derived([exploreNameStore], ([exploreName]) =>
     getRuntimeServiceGetExploreQueryOptions(
-      instanceId,
+      client.instanceId,
       {
         name: exploreName,
       },

From fb10785fdbd8bf93a32655c78af401764d75525c Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Wed, 25 Feb 2026 10:58:49 +0300
Subject: [PATCH 25/27] refactor: migrate web-common features from `runtime`
 store to `RuntimeClient`

Migrate ~100 files across chat, alerts, scheduled reports, file management,
entity management, workspaces, sources, models, metrics-views, connectors,
explore-mappers, exports, and other features from the global `runtime` store
to `useRuntimeClient()` / `RuntimeClient` parameter threading.

Key changes:
- Add `host` property to `RuntimeClient` class
- Convert `canvasChatConfig` to `createCanvasChatConfig(client)` factory
- Thread `RuntimeClient` through `Conversation` and `ConversationManager`
- Migrate `resource-selectors.ts` query option factories to accept `client`
- Migrate chat picker data (models, canvases) to accept `client`
- Migrate `connectors/code-utils.ts`, `file-artifact.ts`, `new-files.ts`,
  `submitAddDataForm.ts`, `explore-mappers/*.ts` to accept instanceId/client
- Migrate `vega-embed-options.ts` to accept `RuntimeClient`
- Migrate `RillIntakeClient` to accept `host` parameter
- All `.svelte` callers updated to use `useRuntimeClient()`
---
 .../ConnectedPreviewTable.svelte              |  6 ++--
 .../components/vega/VegaLiteRenderer.svelte   |  4 +++
 .../src/components/vega/VegaRenderer.svelte   |  4 +++
 .../src/components/vega/vega-embed-options.ts | 22 ++++++------
 .../src/features/alerts/AlertForm.svelte      |  5 +--
 .../src/features/alerts/alert-preview-data.ts |  9 ++---
 .../alerts/criteria-tab/AlertPreview.svelte   |  4 +++
 .../alerts/criteria-tab/CriteriaForm.svelte   |  8 ++---
 .../alerts/data-tab/AlertDialogDataTab.svelte | 18 +++++++---
 .../alerts/data-tab/DataPreview.svelte        |  4 +++
 .../AlertDialogDeliveryTab.svelte             |  8 ++---
 .../features/canvas/CreateCanvasDialog.svelte |  4 +++
 .../src/features/canvas/chat-context.ts       | 30 ++++++++--------
 .../src/features/chat/DashboardChat.svelte    |  4 +--
 .../features/chat/core/context/metadata.ts    |  2 +-
 .../chat/core/context/picker/data/canvases.ts | 15 ++++----
 .../chat/core/context/picker/data/index.ts    |  4 +--
 .../core/context/picker/data/metrics-views.ts |  6 ++--
 .../chat/core/context/picker/data/models.ts   | 10 +++---
 .../chat/core/conversation-manager.ts         | 21 +++++++-----
 .../src/features/chat/core/conversation.ts    | 14 ++++++--
 .../chat/core/messages/Messages.svelte        |  9 ++---
 .../core/messages/chart/ChartBlock.svelte     |  6 ++--
 .../core/messages/text/citation-url-mapper.ts |  2 +-
 web-common/src/features/chat/core/utils.ts    | 34 ++++++++-----------
 .../chat/layouts/fullpage/FullPageChat.svelte |  7 ++--
 .../chat/layouts/inline/InlineChat.svelte     |  7 ++--
 .../chat/layouts/sidebar/SidebarChat.svelte   |  7 ++--
 .../chat/layouts/sidebar/SidebarHeader.svelte |  5 +--
 .../features/connectors/code-utils.spec.ts    | 14 ++++++++
 .../src/features/connectors/code-utils.ts     | 13 +++----
 .../connectors/explorer/TableMenuItems.svelte |  4 +++
 .../explorer/TableWorkspaceHeader.svelte      |  1 +
 .../filters/ExploreFilterChipsReadOnly.svelte |  8 ++++-
 .../ViewAsButton.svelte                       |  4 +--
 .../resetSelectedMockUserAfterNavigate.ts     |  7 ++--
 .../granular-access-policies/updateDevJWT.ts  |  4 +--
 .../editor/FileWorkspaceHeader.svelte         |  6 ++--
 .../entity-management/AddAssetButton.svelte   | 25 +++++++++-----
 .../CreateExploreDialog.svelte                |  4 +++
 .../FileAndResourceWatcher.svelte             |  7 +++-
 .../entity-management/RenameAssetModal.svelte |  6 ++--
 .../file-and-resource-watcher.ts              | 10 ++++--
 .../entity-management/file-artifact.ts        | 10 +++---
 .../entity-management/file-artifacts.ts       | 11 ++++--
 .../entity-management/resource-selectors.ts   | 24 ++++++++-----
 .../explore-mappers/generate-explore-link.ts  |  2 ++
 ...dashboard-from-aggregation-request.spec.ts |  1 +
 .../get-dashboard-from-aggregation-request.ts |  1 +
 .../get-dashboard-from-comparison-request.ts  |  2 ++
 .../explore-mappers/get-mapped-explore-url.ts |  2 +-
 .../explore-mappers/map-to-explore.ts         |  8 ++---
 .../src/features/explore-mappers/utils.ts     | 10 +++---
 .../explores/explore-link/ExploreLink.svelte  |  4 +++
 .../src/features/exports/ExportMenu.svelte    |  9 ++---
 .../file-explorer/FileExplorer.svelte         |  6 ++--
 .../file-explorer/NavDirectoryEntry.svelte    |  6 ++--
 .../src/features/file-explorer/NavFile.svelte |  6 ++--
 .../src/features/file-explorer/new-files.ts   |  9 ++---
 .../metrics-views/GoToDashboardButton.svelte  | 19 ++++++++---
 .../metrics-views/MetricsInspector.svelte     |  5 +--
 .../metrics-views/MetricsViewMenuItems.svelte | 12 +++++--
 .../ai-generation/generateMetricsView.ts      | 16 +++++++--
 .../create-and-preview-explore.ts             |  3 ++
 .../metrics-views/editor/Placeholder.svelte   |  6 ++--
 ...asures-and-dimensions-for-metrics-views.ts |  9 ++---
 .../incremental/ModelRefreshButton.svelte     |  5 +--
 .../models/navigation/ModelMenuItems.svelte   |  9 +++--
 .../models/partitions/PartitionsTable.svelte  |  6 ++--
 .../models/partitions/TriggerPartition.svelte |  5 +--
 .../workspace/CreateDashboardButton.svelte    |  6 ++--
 .../models/workspace/ModelEditor.svelte       |  6 ++--
 .../workspace/ModelWorkspaceCTAs.svelte       |  7 ++--
 .../onboarding/OnboardingWorkspace.svelte     | 11 +++---
 .../navigation/GraphContainer.svelte          |  6 ++--
 .../quick-view/QuickView.svelte               |  6 ++--
 .../sample-data/GenerateSampleData.svelte     |  7 ++--
 .../sample-data/generate-sample-data.ts       |  8 +++--
 .../BaseScheduledReportForm.svelte            | 17 ++++++----
 .../scheduled-reports/ScheduleForm.svelte     |  6 ++--
 .../ScheduledReportDialog.svelte              |  6 ++--
 .../features/sources/errors/ErrorPane.svelte  |  6 ++--
 .../features/sources/modal/AddDataForm.svelte |  8 +++--
 .../sources/modal/AddDataFormManager.ts       | 28 ++++++++++++---
 .../sources/modal/AddDataModal.svelte         |  6 ++--
 .../features/sources/modal/FileDrop.svelte    |  6 ++--
 .../sources/modal/LocalSourceUpload.svelte    |  6 ++--
 .../sources/modal/SourceImportedModal.svelte  |  8 +++--
 .../sources/modal/submitAddDataForm.ts        | 32 +++++++++++------
 .../sources/navigation/SourceMenuItems.svelte | 10 ++++--
 .../features/visual-editing/ThemeInput.svelte |  6 ++--
 .../src/features/welcome/ProjectCards.svelte  |  6 ++--
 .../workspaces/CanvasWorkspace.svelte         | 25 +++++++++-----
 .../workspaces/ExploreWorkspace.svelte        | 18 ++++++----
 .../workspaces/MetricsWorkspace.svelte        | 23 ++++++++-----
 .../features/workspaces/ModelWorkspace.svelte | 23 +++++++++----
 .../workspaces/VisualExploreEditing.svelte    | 13 ++++---
 .../features/workspaces/VisualMetrics.svelte  | 34 ++++++++++++-------
 .../workspaces/WorkspaceBreadcrumbs.svelte    | 14 +++++---
 .../src/layout/ApplicationHeader.svelte       |  5 +--
 web-common/src/metrics/initMetrics.ts         |  7 ++--
 .../src/metrics/service/RillIntakeClient.ts   |  8 ++---
 .../src/runtime-client/v2/runtime-client.ts   |  2 ++
 .../routes/(viz)/explore/[name]/+page.svelte  |  5 ++-
 web-local/src/routes/+layout.svelte           |  2 +-
 105 files changed, 648 insertions(+), 337 deletions(-)

diff --git a/web-common/src/components/preview-table/ConnectedPreviewTable.svelte b/web-common/src/components/preview-table/ConnectedPreviewTable.svelte
index cff98a5f205..ed2ac1e0d94 100644
--- a/web-common/src/components/preview-table/ConnectedPreviewTable.svelte
+++ b/web-common/src/components/preview-table/ConnectedPreviewTable.svelte
@@ -5,7 +5,9 @@
     createQueryServiceTableColumns,
     createQueryServiceTableRows,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+
+  const runtimeClient = useRuntimeClient();
   import WorkspaceError from "../WorkspaceError.svelte";
   import type { VirtualizedTableColumns } from "../virtualized-table/types";
   import PreviewTable from "./PreviewTable.svelte";
@@ -19,7 +21,7 @@
   let columns: VirtualizedTableColumns[] | undefined;
   let rows: V1TableRowsResponseDataItem[] | undefined;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: columnsQuery = createQueryServiceTableColumns(instanceId, table, {
     connector,
diff --git a/web-common/src/components/vega/VegaLiteRenderer.svelte b/web-common/src/components/vega/VegaLiteRenderer.svelte
index 52e774a2e92..f15d68a9039 100644
--- a/web-common/src/components/vega/VegaLiteRenderer.svelte
+++ b/web-common/src/components/vega/VegaLiteRenderer.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import CancelCircle from "@rilldata/web-common/components/icons/CancelCircle.svelte";
   import type { ColorMapping } from "@rilldata/web-common/features/components/charts/types";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { onDestroy } from "svelte";
   import {
     type SignalListeners,
@@ -14,6 +15,8 @@
   import { VegaLiteTooltipHandler } from "./vega-tooltip";
   import "./vega.css";
 
+  const runtimeClient = useRuntimeClient();
+
   export let data: Record<string, unknown> = {};
   export let spec: VisualizationSpec;
   export let signalListeners: SignalListeners = {};
@@ -46,6 +49,7 @@
   }
 
   $: options = createEmbedOptions({
+    client: runtimeClient,
     canvasDashboard,
     width,
     height,
diff --git a/web-common/src/components/vega/VegaRenderer.svelte b/web-common/src/components/vega/VegaRenderer.svelte
index bad9890ad9b..5b16a0179fc 100644
--- a/web-common/src/components/vega/VegaRenderer.svelte
+++ b/web-common/src/components/vega/VegaRenderer.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import CancelCircle from "@rilldata/web-common/components/icons/CancelCircle.svelte";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { onDestroy } from "svelte";
   import {
     type SignalListeners,
@@ -12,6 +13,8 @@
   import { VegaLiteTooltipHandler } from "./vega-tooltip";
   import "./vega.css";
 
+  const runtimeClient = useRuntimeClient();
+
   export let data: Record<string, unknown> = {};
   export let spec: VisualizationSpec;
   export let signalListeners: SignalListeners = {};
@@ -66,6 +69,7 @@
   }
 
   $: options = createEmbedOptions({
+    client: runtimeClient,
     canvasDashboard,
     width,
     height,
diff --git a/web-common/src/components/vega/vega-embed-options.ts b/web-common/src/components/vega/vega-embed-options.ts
index 7170ba76f21..fbc5763cb16 100644
--- a/web-common/src/components/vega/vega-embed-options.ts
+++ b/web-common/src/components/vega/vega-embed-options.ts
@@ -1,14 +1,14 @@
 import type { ColorMapping } from "@rilldata/web-common/features/components/charts/types";
 import { ComparisonDeltaPreviousSuffix } from "@rilldata/web-common/features/dashboards/filters/measure-filters/measure-filter-entry";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { EmbedOptions } from "svelte-vega";
-import { get } from "svelte/store";
 import { expressionInterpreter } from "vega-interpreter";
 import type { Config } from "vega-lite";
 import type { ExpressionFunction } from "./types";
 import { getRillTheme } from "./vega-config";
 
 export interface CreateEmbedOptionsParams {
+  client: RuntimeClient;
   canvasDashboard: boolean;
   width: number;
   height: number;
@@ -22,6 +22,7 @@ export interface CreateEmbedOptionsParams {
 }
 
 export function createEmbedOptions({
+  client,
   canvasDashboard,
   width,
   height,
@@ -33,7 +34,7 @@ export function createEmbedOptions({
   colorMapping,
   hasComparison,
 }: CreateEmbedOptionsParams): EmbedOptions {
-  const jwt = get(runtime).jwt;
+  const jwt = client.getJwt();
 
   return {
     config: config || getRillTheme(canvasDashboard, themeMode === "dark"),
@@ -55,15 +56,14 @@ export function createEmbedOptions({
     }),
     expressionFunctions,
     loader: {
-      baseURL: `${get(runtime).host}/v1/instances/${get(runtime).instanceId}/assets/`,
-      ...(jwt &&
-        jwt.token && {
-          http: {
-            headers: {
-              Authorization: `Bearer ${jwt.token}`,
-            },
+      baseURL: `${client.host}/v1/instances/${client.instanceId}/assets/`,
+      ...(jwt && {
+        http: {
+          headers: {
+            Authorization: `Bearer ${jwt}`,
           },
-        }),
+        },
+      }),
     },
   };
 }
diff --git a/web-common/src/features/alerts/AlertForm.svelte b/web-common/src/features/alerts/AlertForm.svelte
index cfb62c493d1..39c28bb7227 100644
--- a/web-common/src/features/alerts/AlertForm.svelte
+++ b/web-common/src/features/alerts/AlertForm.svelte
@@ -59,7 +59,7 @@
     getRuntimeServiceGetResourceQueryKey,
     getRuntimeServiceListResourcesQueryKey,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { X } from "lucide-svelte";
   import { defaults, superForm } from "sveltekit-superforms";
   import Button from "web-common/src/components/button/Button.svelte";
@@ -69,9 +69,10 @@
   export let props: CreateAlertProps | EditAlertProps;
 
   const user = createAdminServiceGetCurrentUser();
+  const runtimeClient = useRuntimeClient();
 
   $: ({ organization, project, alert: alertName } = $page.params);
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   // Convenience variable to be used when other fields from props are not needed.
   // Typescript won't parse the object switch if this is used in conditionals, so some statements below don't use this.
diff --git a/web-common/src/features/alerts/alert-preview-data.ts b/web-common/src/features/alerts/alert-preview-data.ts
index 9e82f535a17..1b417ee3d87 100644
--- a/web-common/src/features/alerts/alert-preview-data.ts
+++ b/web-common/src/features/alerts/alert-preview-data.ts
@@ -29,13 +29,13 @@ import {
   type V1MetricsViewAggregationResponseDataItem,
   type V1MetricsViewSpec,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { QueryClient } from "@tanstack/query-core";
 import type {
   CreateQueryOptions,
   CreateQueryResult,
 } from "@tanstack/svelte-query";
-import { derived, get } from "svelte/store";
+import { derived } from "svelte/store";
 
 export type AlertPreviewResponse = {
   rows: V1MetricsViewAggregationResponseDataItem[];
@@ -43,6 +43,7 @@ export type AlertPreviewResponse = {
 };
 
 export function getAlertPreviewData(
+  client: RuntimeClient,
   queryClient: QueryClient,
   formValues: AlertFormValues,
   filters: Filters,
@@ -50,13 +51,13 @@ export function getAlertPreviewData(
 ): CreateQueryResult<AlertPreviewResponse> {
   return derived(
     [
-      useExploreValidSpec(get(runtime).instanceId, formValues.exploreName),
+      useExploreValidSpec(client.instanceId, formValues.exploreName),
       filters.getStore(),
       timeControls.getStore(),
     ],
     ([validExploreSpec, filtersState, timeControlsState], set) =>
       createQueryServiceMetricsViewAggregation(
-        get(runtime).instanceId,
+        client.instanceId,
         formValues.metricsViewName,
         getAlertPreviewQueryRequest(
           formValues,
diff --git a/web-common/src/features/alerts/criteria-tab/AlertPreview.svelte b/web-common/src/features/alerts/criteria-tab/AlertPreview.svelte
index 4ad4864533c..d4c6e72bfc1 100644
--- a/web-common/src/features/alerts/criteria-tab/AlertPreview.svelte
+++ b/web-common/src/features/alerts/criteria-tab/AlertPreview.svelte
@@ -9,13 +9,17 @@
   import type { TimeControls } from "@rilldata/web-common/features/dashboards/stores/TimeControls.ts";
   import PreviewEmpty from "../PreviewEmpty.svelte";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { DimensionTableRow } from "../../dashboards/dimension-table/dimension-table-types";
 
   export let formValues: AlertFormValues;
   export let filters: Filters;
   export let timeControls: TimeControls;
 
+  const runtimeClient = useRuntimeClient();
+
   $: alertPreviewQuery = getAlertPreviewData(
+    runtimeClient,
     queryClient,
     formValues,
     filters,
diff --git a/web-common/src/features/alerts/criteria-tab/CriteriaForm.svelte b/web-common/src/features/alerts/criteria-tab/CriteriaForm.svelte
index 2518a9d7c52..7a96de4c6e3 100644
--- a/web-common/src/features/alerts/criteria-tab/CriteriaForm.svelte
+++ b/web-common/src/features/alerts/criteria-tab/CriteriaForm.svelte
@@ -11,19 +11,19 @@
   import { onMount } from "svelte";
   import { slide } from "svelte/transition";
   import type { SuperForm } from "sveltekit-superforms/client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let superFormInstance: SuperForm<AlertFormValues>;
   export let timeControls: TimeControls;
   export let index: number;
 
+  const runtimeClient = useRuntimeClient();
+
   $: ({ form, errors, validate } = superFormInstance);
   $: ({ selectedComparisonTimeRange } = timeControls);
 
-  $: ({ instanceId } = $runtime);
-
   $: metricsView = useMetricsViewValidSpec(
-    instanceId,
+    runtimeClient.instanceId,
     $form["metricsViewName"],
   );
 
diff --git a/web-common/src/features/alerts/data-tab/AlertDialogDataTab.svelte b/web-common/src/features/alerts/data-tab/AlertDialogDataTab.svelte
index ff6794730e7..96fe699eae8 100644
--- a/web-common/src/features/alerts/data-tab/AlertDialogDataTab.svelte
+++ b/web-common/src/features/alerts/data-tab/AlertDialogDataTab.svelte
@@ -8,19 +8,22 @@
   import type { SuperForm } from "sveltekit-superforms/client";
   import FormSection from "../../../components/forms/FormSection.svelte";
   import Select from "../../../components/forms/Select.svelte";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useMetricsViewValidSpec } from "../../dashboards/selectors";
 
   export let superFormInstance: SuperForm<AlertFormValues>;
   export let filters: Filters;
   export let timeControls: TimeControls;
 
-  $: ({ form } = superFormInstance);
+  const runtimeClient = useRuntimeClient();
 
-  $: ({ instanceId } = $runtime);
+  $: ({ form } = superFormInstance);
 
   $: metricsViewName = $form["metricsViewName"]; // memoise to avoid rerenders
-  $: metricsView = useMetricsViewValidSpec(instanceId, metricsViewName);
+  $: metricsView = useMetricsViewValidSpec(
+    runtimeClient.instanceId,
+    metricsViewName,
+  );
 
   $: measureOptions =
     $metricsView.data?.measures
@@ -51,7 +54,12 @@
 
 <div class="flex flex-col gap-y-3">
   <FormSection title="Filters">
-    <FiltersForm {instanceId} {filters} {timeControls} maxWidth={750} />
+    <FiltersForm
+      instanceId={runtimeClient.instanceId}
+      {filters}
+      {timeControls}
+      maxWidth={750}
+    />
   </FormSection>
   <FormSection
     description="Select the measures you want to monitor."
diff --git a/web-common/src/features/alerts/data-tab/DataPreview.svelte b/web-common/src/features/alerts/data-tab/DataPreview.svelte
index 0397aaa09fd..594f35be61a 100644
--- a/web-common/src/features/alerts/data-tab/DataPreview.svelte
+++ b/web-common/src/features/alerts/data-tab/DataPreview.svelte
@@ -7,6 +7,7 @@
   import type { Filters } from "@rilldata/web-common/features/dashboards/stores/Filters.ts";
   import type { TimeControls } from "@rilldata/web-common/features/dashboards/stores/TimeControls.ts";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import PreviewEmpty from "../PreviewEmpty.svelte";
   import type { DimensionTableRow } from "../../dashboards/dimension-table/dimension-table-types";
 
@@ -14,7 +15,10 @@
   export let filters: Filters;
   export let timeControls: TimeControls;
 
+  const runtimeClient = useRuntimeClient();
+
   $: alertPreviewQuery = getAlertPreviewData(
+    runtimeClient,
     queryClient,
     {
       ...formValues,
diff --git a/web-common/src/features/alerts/delivery-tab/AlertDialogDeliveryTab.svelte b/web-common/src/features/alerts/delivery-tab/AlertDialogDeliveryTab.svelte
index 24e7fd0b188..7d48da19a6b 100644
--- a/web-common/src/features/alerts/delivery-tab/AlertDialogDeliveryTab.svelte
+++ b/web-common/src/features/alerts/delivery-tab/AlertDialogDeliveryTab.svelte
@@ -8,17 +8,17 @@
   import { SnoozeOptions } from "@rilldata/web-common/features/alerts/delivery-tab/snooze";
   import type { AlertFormValues } from "@rilldata/web-common/features/alerts/form-utils";
   import ScheduleForm from "@rilldata/web-common/features/scheduled-reports/ScheduleForm.svelte";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { SuperForm } from "sveltekit-superforms/client";
 
   export let superFormInstance: SuperForm<AlertFormValues>;
   export let exploreName: string;
 
-  $: ({ form, errors } = superFormInstance);
+  const runtimeClient = useRuntimeClient();
 
-  $: ({ instanceId } = $runtime);
+  $: ({ form, errors } = superFormInstance);
 
-  $: hasSlackNotifier = getHasSlackConnection(instanceId);
+  $: hasSlackNotifier = getHasSlackConnection(runtimeClient.instanceId);
 </script>
 
 <div class="flex flex-col gap-y-3">
diff --git a/web-common/src/features/canvas/CreateCanvasDialog.svelte b/web-common/src/features/canvas/CreateCanvasDialog.svelte
index f22e598864a..427e3477023 100644
--- a/web-common/src/features/canvas/CreateCanvasDialog.svelte
+++ b/web-common/src/features/canvas/CreateCanvasDialog.svelte
@@ -9,12 +9,15 @@
   import Select from "@rilldata/web-common/components/forms/Select.svelte";
   import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
   import type { V1Resource } from "@rilldata/web-common/runtime-client";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import { createResourceFile } from "../file-explorer/new-files";
 
   export let open = false;
   export let metricsViews: V1Resource[];
   export let wrapNavigation: (path: string | undefined) => Promise<void>;
 
+  const runtimeClient = useRuntimeClient();
+
   let selectedMetricsView: V1Resource | undefined = undefined;
 
   $: metricsViewOptions = metricsViews.map((resource) => ({
@@ -25,6 +28,7 @@
   async function createResource() {
     if (selectedMetricsView) {
       const newFilePath = await createResourceFile(
+        runtimeClient,
         ResourceKind.Canvas,
         selectedMetricsView,
       );
diff --git a/web-common/src/features/canvas/chat-context.ts b/web-common/src/features/canvas/chat-context.ts
index 7d5a363b172..9f93edf9723 100644
--- a/web-common/src/features/canvas/chat-context.ts
+++ b/web-common/src/features/canvas/chat-context.ts
@@ -7,27 +7,29 @@ import type {
   V1AnalystAgentContext,
 } from "@rilldata/web-common/runtime-client";
 import { getCanvasNameStore } from "@rilldata/web-common/features/dashboards/nav-utils.ts";
-import { derived, get, type Readable } from "svelte/store";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+import { derived, type Readable } from "svelte/store";
 import { getCanvasStoreUnguarded } from "@rilldata/web-common/features/canvas/state-managers/state-managers.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
-export const canvasChatConfig = {
-  agent: ToolName.ANALYST_AGENT,
-  additionalContextStoreGetter: () => getActiveCanvasContext(),
-  emptyChatLabel: "Happy to help explore your data",
-  placeholder:
-    "Type a question, or press @ to insert a metric, dimension, or measure.",
-  minChatHeight: "min-h-[4rem]",
-} satisfies ChatConfig;
+export function createCanvasChatConfig(client: RuntimeClient): ChatConfig {
+  return {
+    agent: ToolName.ANALYST_AGENT,
+    additionalContextStoreGetter: () => getActiveCanvasContext(client),
+    emptyChatLabel: "Happy to help explore your data",
+    placeholder:
+      "Type a question, or press @ to insert a metric, dimension, or measure.",
+    minChatHeight: "min-h-[4rem]",
+  };
+}
 
 /**
  * Creates a store that contains the active explore context sent to the Complete API.
  * It returns RuntimeServiceCompleteBody with V1AnalystAgentContext that is passed to the API.
  */
-function getActiveCanvasContext(): Readable<
-  Partial<RuntimeServiceCompleteBody>
-> {
-  const instanceId = get(runtime).instanceId;
+function getActiveCanvasContext(
+  client: RuntimeClient,
+): Readable<Partial<RuntimeServiceCompleteBody>> {
+  const instanceId = client.instanceId;
   const canvasNameStore = getCanvasNameStore();
 
   return derived([canvasNameStore], ([canvasName], set) => {
diff --git a/web-common/src/features/chat/DashboardChat.svelte b/web-common/src/features/chat/DashboardChat.svelte
index a18fe0e98d4..d2cb5a949af 100644
--- a/web-common/src/features/chat/DashboardChat.svelte
+++ b/web-common/src/features/chat/DashboardChat.svelte
@@ -4,7 +4,7 @@
   import { chatOpen } from "./layouts/sidebar/sidebar-store";
   import { createDashboardChatConfig } from "@rilldata/web-common/features/dashboards/chat-context.ts";
   import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors.ts";
-  import { canvasChatConfig } from "@rilldata/web-common/features/canvas/chat-context.ts";
+  import { createCanvasChatConfig } from "@rilldata/web-common/features/canvas/chat-context.ts";
   import ThemeProvider from "@rilldata/web-common/features/dashboards/ThemeProvider.svelte";
   import { activeDashboardTheme } from "@rilldata/web-common/features/themes/active-dashboard-theme";
   import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
@@ -17,7 +17,7 @@
   $: chatConfig =
     kind === ResourceKind.Explore
       ? createDashboardChatConfig(runtimeClient)
-      : canvasChatConfig;
+      : createCanvasChatConfig(runtimeClient);
 
   const { dashboardChat } = featureFlags;
 </script>
diff --git a/web-common/src/features/chat/core/context/metadata.ts b/web-common/src/features/chat/core/context/metadata.ts
index 329a51cd234..5c9d46c54eb 100644
--- a/web-common/src/features/chat/core/context/metadata.ts
+++ b/web-common/src/features/chat/core/context/metadata.ts
@@ -43,7 +43,7 @@ export function getInlineChatContextMetadata(
   );
 
   const canvasResourcesQuery = createQuery(
-    getClientFilteredResourcesQueryOptions(ResourceKind.Canvas, (res) =>
+    getClientFilteredResourcesQueryOptions(client, ResourceKind.Canvas, (res) =>
       Boolean(res.canvas?.state?.validSpec),
     ),
     queryClient,
diff --git a/web-common/src/features/chat/core/context/picker/data/canvases.ts b/web-common/src/features/chat/core/context/picker/data/canvases.ts
index dad80361200..b66f5555de3 100644
--- a/web-common/src/features/chat/core/context/picker/data/canvases.ts
+++ b/web-common/src/features/chat/core/context/picker/data/canvases.ts
@@ -1,5 +1,5 @@
 import type { PickerItem } from "@rilldata/web-common/features/chat/core/context/picker/picker-tree.ts";
-import { derived, get, type Readable } from "svelte/store";
+import { derived, type Readable } from "svelte/store";
 import {
   getClientFilteredResourcesQueryOptions,
   ResourceKind,
@@ -7,7 +7,6 @@ import {
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.ts";
 import { getCanvasNameStore } from "@rilldata/web-common/features/dashboards/nav-utils.ts";
 import { createQuery } from "@tanstack/svelte-query";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
 import { getQueryServiceResolveCanvasQueryOptions } from "@rilldata/web-common/runtime-client";
 import {
   getIdForContext,
@@ -17,19 +16,21 @@ import {
 import { ContextPickerUIState } from "@rilldata/web-common/features/chat/core/context/picker/ui-state.ts";
 import { getLatestConversationQueryOptions } from "@rilldata/web-common/features/chat/core/utils.ts";
 import { MessageType } from "@rilldata/web-common/features/chat/core/types.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
 export function getCanvasesPickerOptions(
+  client: RuntimeClient,
   uiState: ContextPickerUIState,
 ): Readable<PickerItem[]> {
   const canvasResourcesQuery = createQuery(
-    getClientFilteredResourcesQueryOptions(ResourceKind.Canvas, (res) =>
+    getClientFilteredResourcesQueryOptions(client, ResourceKind.Canvas, (res) =>
       Boolean(res.canvas?.state?.validSpec),
     ),
     queryClient,
   );
-  const lastUsedCanvasNameStore = getLastUsedCanvasNameStore();
+  const lastUsedCanvasNameStore = getLastUsedCanvasNameStore(client);
   const activeCanvasNameStore = getCanvasNameStore();
-  const instanceId = get(runtime).instanceId;
+  const instanceId = client.instanceId;
 
   return derived(
     [canvasResourcesQuery, lastUsedCanvasNameStore, activeCanvasNameStore],
@@ -133,9 +134,9 @@ function getCanvasComponentsQueryOptions(
 /**
  * Looks at the last conversation and returns the canvas used in the last message or tool call.
  */
-function getLastUsedCanvasNameStore() {
+function getLastUsedCanvasNameStore(client: RuntimeClient) {
   const lastConversationQuery = createQuery(
-    getLatestConversationQueryOptions(),
+    getLatestConversationQueryOptions(client),
     queryClient,
   );
 
diff --git a/web-common/src/features/chat/core/context/picker/data/index.ts b/web-common/src/features/chat/core/context/picker/data/index.ts
index c67f5a4c903..e6b895d86f3 100644
--- a/web-common/src/features/chat/core/context/picker/data/index.ts
+++ b/web-common/src/features/chat/core/context/picker/data/index.ts
@@ -27,8 +27,8 @@ export function getPickerOptions(
     [
       getInlineChatContextMetadata(client),
       getMetricsViewPickerOptions(client),
-      getCanvasesPickerOptions(uiState),
-      isRillDev ? getModelsPickerOptions(uiState) : readable(null),
+      getCanvasesPickerOptions(client, uiState),
+      isRillDev ? getModelsPickerOptions(client, uiState) : readable(null),
       uiState.expandedParentsStore,
     ],
     ([metadata, metricsViewOptions, canvasOptions, filesOption]) => {
diff --git a/web-common/src/features/chat/core/context/picker/data/metrics-views.ts b/web-common/src/features/chat/core/context/picker/data/metrics-views.ts
index 4f46b44e7dd..f24348f5860 100644
--- a/web-common/src/features/chat/core/context/picker/data/metrics-views.ts
+++ b/web-common/src/features/chat/core/context/picker/data/metrics-views.ts
@@ -26,7 +26,7 @@ export function getMetricsViewPickerOptions(
     queryClient,
   );
 
-  const lastUsedMetricsViewStore = getLastUsedMetricsViewNameStore();
+  const lastUsedMetricsViewStore = getLastUsedMetricsViewNameStore(client);
   const activeMetricsViewStore = getActiveMetricsViewNameStore(client);
 
   return derived(
@@ -88,9 +88,9 @@ export function getMetricsViewPickerOptions(
 /**
  * Looks at the last conversation and returns the metrics view used in the last message or tool call.
  */
-function getLastUsedMetricsViewNameStore() {
+function getLastUsedMetricsViewNameStore(client: RuntimeClient) {
   const lastConversationQuery = createQuery(
-    getLatestConversationQueryOptions(),
+    getLatestConversationQueryOptions(client),
     queryClient,
   );
 
diff --git a/web-common/src/features/chat/core/context/picker/data/models.ts b/web-common/src/features/chat/core/context/picker/data/models.ts
index 736912ce714..ceba9c6aaa2 100644
--- a/web-common/src/features/chat/core/context/picker/data/models.ts
+++ b/web-common/src/features/chat/core/context/picker/data/models.ts
@@ -14,10 +14,10 @@ import {
 } from "@rilldata/web-common/features/entity-management/resource-selectors.ts";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.ts";
 import { derived, type Readable } from "svelte/store";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
 import { createQuery } from "@tanstack/svelte-query";
 import { ContextPickerUIState } from "@rilldata/web-common/features/chat/core/context/picker/ui-state.ts";
 import type { PickerItem } from "@rilldata/web-common/features/chat/core/context/picker/picker-tree.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
 /**
  * Creates a store that contains a 2-level list of sources/model resources.
@@ -26,17 +26,19 @@ import type { PickerItem } from "@rilldata/web-common/features/chat/core/context
  * NOTE: this only lists resources that are parsed as sources/models. Any parse errors will exclude the file.
  */
 export function getModelsPickerOptions(
+  client: RuntimeClient,
   uiState: ContextPickerUIState,
 ): Readable<PickerItem[]> {
   const modelResourcesQuery = createQuery(
-    getClientFilteredResourcesQueryOptions(ResourceKind.Model),
+    getClientFilteredResourcesQueryOptions(client, ResourceKind.Model),
     queryClient,
   );
   const activeResourceStore = getActiveResourceStore();
 
   return derived(
-    [runtime, modelResourcesQuery, activeResourceStore],
-    ([{ instanceId }, modelResourcesResp, activeResource], set) => {
+    [modelResourcesQuery, activeResourceStore],
+    ([modelResourcesResp, activeResource], set) => {
+      const instanceId = client.instanceId;
       const models = modelResourcesResp.data ?? [];
       const modelPickerItems: PickerItem[] = [];
       const modelQueryOptions: ReturnType<
diff --git a/web-common/src/features/chat/core/conversation-manager.ts b/web-common/src/features/chat/core/conversation-manager.ts
index 39aeb65e8e9..8937ae816ff 100644
--- a/web-common/src/features/chat/core/conversation-manager.ts
+++ b/web-common/src/features/chat/core/conversation-manager.ts
@@ -4,6 +4,7 @@ import {
   type RpcStatus,
   type V1ListConversationsResponse,
 } from "@rilldata/web-common/runtime-client";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createQuery, type CreateQueryResult } from "@tanstack/svelte-query";
 import { derived, get, type Readable } from "svelte/store";
 import { Conversation } from "./conversation";
@@ -51,8 +52,12 @@ export class ConversationManager {
   private conversationSelector: ConversationSelector;
   private readonly agent?: string;
 
+  public get instanceId(): string {
+    return this.client.instanceId;
+  }
+
   constructor(
-    public readonly instanceId: string,
+    private readonly client: RuntimeClient,
     options: ConversationManagerOptions,
   ) {
     this.agent = options.agent;
@@ -110,7 +115,7 @@ export class ConversationManager {
 
         // Otherwise, create a conversation instance and store it
         const conversation = new Conversation(
-          this.instanceId,
+          this.client,
           $conversationId,
           this.agent,
         );
@@ -159,7 +164,7 @@ export class ConversationManager {
   private createNewConversation() {
     this.newConversationUnsub?.();
     this.newConversation = new Conversation(
-      this.instanceId,
+      this.client,
       NEW_CONVERSATION_ID,
       this.agent,
     );
@@ -278,21 +283,21 @@ function getConversationManagerKey(instanceId: string, agent?: string): string {
 }
 
 /**
- * Get or create a ConversationManager instance for the given instanceId and agent
+ * Get or create a ConversationManager instance for the given client and agent
  *
- * @param instanceId - The project/instance identifier
+ * @param client - The RuntimeClient instance
  * @param options - Configuration options for the conversation manager instance
  * @returns The ConversationManager instance for this project and agent
  */
 export function getConversationManager(
-  instanceId: string,
+  client: RuntimeClient,
   options: ConversationManagerOptions,
 ): ConversationManager {
-  const key = getConversationManagerKey(instanceId, options.agent);
+  const key = getConversationManagerKey(client.instanceId, options.agent);
   if (!conversationManagerInstances.has(key)) {
     conversationManagerInstances.set(
       key,
-      new ConversationManager(instanceId, options),
+      new ConversationManager(client, options),
     );
   }
   return conversationManagerInstances.get(key)!;
diff --git a/web-common/src/features/chat/core/conversation.ts b/web-common/src/features/chat/core/conversation.ts
index fec4fa10153..9595d00f3cc 100644
--- a/web-common/src/features/chat/core/conversation.ts
+++ b/web-common/src/features/chat/core/conversation.ts
@@ -11,7 +11,7 @@ import {
   type V1GetConversationResponse,
   type V1Message,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import {
   SSEFetchClient,
   SSEHttpError,
@@ -80,6 +80,14 @@ export class Conversation {
   // Reactive store for conversationId - enables query to auto-update when ID changes
   private readonly conversationIdStore: Writable<string>;
 
+  private get instanceId(): string {
+    return this.client.instanceId;
+  }
+
+  public get runtimeClient(): RuntimeClient {
+    return this.client;
+  }
+
   public get conversationId(): string {
     return get(this.conversationIdStore);
   }
@@ -89,7 +97,7 @@ export class Conversation {
   }
 
   constructor(
-    private readonly instanceId: string,
+    private readonly client: RuntimeClient,
     initialConversationId: string,
     private readonly agent: string = ToolName.ANALYST_AGENT,
   ) {
@@ -334,7 +342,7 @@ export class Conversation {
     this.ensureSSEClient();
     this.sseClient!.stop();
 
-    const baseUrl = `${get(runtime).host}/v1/instances/${this.instanceId}/ai/complete/stream?stream=messages`;
+    const baseUrl = `${this.client.host}/v1/instances/${this.instanceId}/ai/complete/stream?stream=messages`;
 
     const requestBody = {
       instanceId: this.instanceId,
diff --git a/web-common/src/features/chat/core/messages/Messages.svelte b/web-common/src/features/chat/core/messages/Messages.svelte
index 877603d5a1d..3db9cfd3808 100644
--- a/web-common/src/features/chat/core/messages/Messages.svelte
+++ b/web-common/src/features/chat/core/messages/Messages.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
   import { createQuery } from "@tanstack/svelte-query";
   import { afterUpdate } from "svelte";
-  import { derived } from "svelte/store";
   import { getRuntimeServiceListToolsQueryOptions } from "../../../../runtime-client";
-  import { runtime } from "../../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import DelayedSpinner from "../../../entity-management/DelayedSpinner.svelte";
   import type { ConversationManager } from "../conversation-manager";
   import FeedbackModal from "../feedback/FeedbackModal.svelte";
@@ -25,9 +24,11 @@
   let feedbackModalOpen = false;
   let pendingFeedbackMessageId: string | null = null;
 
+  const runtimeClient = useRuntimeClient();
+
   // Prefetch tools metadata for tool call display names
-  const listToolsQueryOptionsStore = derived(runtime, ($runtime) =>
-    getRuntimeServiceListToolsQueryOptions($runtime.instanceId),
+  const listToolsQueryOptionsStore = getRuntimeServiceListToolsQueryOptions(
+    runtimeClient.instanceId,
   );
   const listToolsQuery = createQuery(listToolsQueryOptionsStore);
   $: tools = $listToolsQuery.data?.tools;
diff --git a/web-common/src/features/chat/core/messages/chart/ChartBlock.svelte b/web-common/src/features/chat/core/messages/chart/ChartBlock.svelte
index 6ccd1293e6d..bd455741d6d 100644
--- a/web-common/src/features/chat/core/messages/chart/ChartBlock.svelte
+++ b/web-common/src/features/chat/core/messages/chart/ChartBlock.svelte
@@ -13,7 +13,7 @@
   import { Theme } from "@rilldata/web-common/features/themes/theme";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { createRuntimeServiceGetInstance } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { readable } from "svelte/store";
   import type { V1Tool } from "../../../../../runtime-client";
   import ToolCall from "../tools/ToolCall.svelte";
@@ -22,11 +22,13 @@
   export let block: ChartBlock;
   export let tools: V1Tool[] | undefined = undefined;
 
+  const runtimeClient = useRuntimeClient();
+
   // Page params for chart
   $: organization = $page.params.organization;
   $: project = $page.params.project;
 
-  $: instanceId = $runtime.instanceId;
+  $: instanceId = runtimeClient.instanceId;
 
   // Cast chartSpec to any for property access (type comes from parsed JSON)
   $: chartSpec = block.chartSpec as any;
diff --git a/web-common/src/features/chat/core/messages/text/citation-url-mapper.ts b/web-common/src/features/chat/core/messages/text/citation-url-mapper.ts
index 8f88e62642f..7ef4185c712 100644
--- a/web-common/src/features/chat/core/messages/text/citation-url-mapper.ts
+++ b/web-common/src/features/chat/core/messages/text/citation-url-mapper.ts
@@ -38,7 +38,7 @@ export function getMetricsResolverQueryToUrlMapperStore(
   data?: (url: URL) => string;
 }> {
   const resourcesQuery = createQuery(
-    getMetricsViewAndExploreSpecsQueryOptions(),
+    getMetricsViewAndExploreSpecsQueryOptions(conversation.runtimeClient),
     queryClient,
   );
   const conversationQuery = conversation.getConversationQuery();
diff --git a/web-common/src/features/chat/core/utils.ts b/web-common/src/features/chat/core/utils.ts
index 82a2530a8cf..04d164073ce 100644
--- a/web-common/src/features/chat/core/utils.ts
+++ b/web-common/src/features/chat/core/utils.ts
@@ -12,7 +12,7 @@ import {
   type V1Message,
 } from "@rilldata/web-common/runtime-client";
 import { MessageContentType, ToolName } from "./types";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { derived } from "svelte/store";
 import { createQuery } from "@tanstack/svelte-query";
 
@@ -80,13 +80,12 @@ export function invalidateConversationsList(instanceId: string) {
 /**
  * Returns the last updated conversation ID.
  */
-export function getLatestConversationQueryOptions() {
-  const listConversationsQueryOptions = derived(runtime, ({ instanceId }) =>
-    getRuntimeServiceListConversationsQueryOptions(instanceId, {
+export function getLatestConversationQueryOptions(client: RuntimeClient) {
+  const listConversationsQueryOptions =
+    getRuntimeServiceListConversationsQueryOptions(client.instanceId, {
       // Filter to only show Rill client conversations, excluding MCP conversations
       userAgentPattern: "rill%",
-    }),
-  );
+    });
   const lastConversationId = derived(
     createQuery(listConversationsQueryOptions, queryClient),
     (conversationsResp) => {
@@ -97,18 +96,15 @@ export function getLatestConversationQueryOptions() {
     },
   );
 
-  return derived(
-    [lastConversationId, runtime],
-    ([lastConversationId, { instanceId }]) => {
-      return getRuntimeServiceGetConversationQueryOptions(
-        instanceId,
-        lastConversationId ?? "",
-        {
-          query: {
-            enabled: !!lastConversationId,
-          },
+  return derived([lastConversationId], ([id]) => {
+    return getRuntimeServiceGetConversationQueryOptions(
+      client.instanceId,
+      id ?? "",
+      {
+        query: {
+          enabled: !!id,
         },
-      );
-    },
-  );
+      },
+    );
+  });
 }
diff --git a/web-common/src/features/chat/layouts/fullpage/FullPageChat.svelte b/web-common/src/features/chat/layouts/fullpage/FullPageChat.svelte
index 6b4e524f605..6ad7caa4244 100644
--- a/web-common/src/features/chat/layouts/fullpage/FullPageChat.svelte
+++ b/web-common/src/features/chat/layouts/fullpage/FullPageChat.svelte
@@ -4,7 +4,7 @@
   import { featureFlags } from "@rilldata/web-common/features/feature-flags";
   import { projectChat } from "@rilldata/web-common/features/project/chat-context.ts";
   import { onMount } from "svelte";
-  import { runtime } from "../../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import {
     cleanupConversationManager,
     getConversationManager,
@@ -20,11 +20,12 @@
 
   const { adminServer } = featureFlags;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+  $: instanceId = runtimeClient.instanceId;
   $: organization = $page.params.organization;
   $: project = $page.params.project;
 
-  $: conversationManager = getConversationManager(instanceId, {
+  $: conversationManager = getConversationManager(runtimeClient, {
     conversationState: "url",
   });
 
diff --git a/web-common/src/features/chat/layouts/inline/InlineChat.svelte b/web-common/src/features/chat/layouts/inline/InlineChat.svelte
index f500d506cc5..a6bd3dc46b0 100644
--- a/web-common/src/features/chat/layouts/inline/InlineChat.svelte
+++ b/web-common/src/features/chat/layouts/inline/InlineChat.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { beforeNavigate } from "$app/navigation";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import {
     cleanupConversationManager,
     getConversationManager,
@@ -11,9 +11,10 @@
   export let noMargin = false;
   export let height: string | undefined = undefined;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+  $: instanceId = runtimeClient.instanceId;
 
-  $: conversationManager = getConversationManager(instanceId, {
+  $: conversationManager = getConversationManager(runtimeClient, {
     conversationState: "url",
   });
 
diff --git a/web-common/src/features/chat/layouts/sidebar/SidebarChat.svelte b/web-common/src/features/chat/layouts/sidebar/SidebarChat.svelte
index 9bedde8ae8f..6a9dce687bc 100644
--- a/web-common/src/features/chat/layouts/sidebar/SidebarChat.svelte
+++ b/web-common/src/features/chat/layouts/sidebar/SidebarChat.svelte
@@ -2,7 +2,7 @@
   import { beforeNavigate } from "$app/navigation";
   import { onMount } from "svelte";
   import Resizer from "../../../../layout/Resizer.svelte";
-  import { runtime } from "../../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { getConversationManager } from "../../core/conversation-manager";
   import ChatInput from "../../core/input/ChatInput.svelte";
   import Messages from "../../core/messages/Messages.svelte";
@@ -17,10 +17,11 @@
 
   export let config: ChatConfig;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+  $: instanceId = runtimeClient.instanceId;
 
   // Initialize conversation manager with browser storage for conversation management
-  $: conversationManager = getConversationManager(instanceId, {
+  $: conversationManager = getConversationManager(runtimeClient, {
     conversationState: "browserStorage",
     agent: config.agent,
   });
diff --git a/web-common/src/features/chat/layouts/sidebar/SidebarHeader.svelte b/web-common/src/features/chat/layouts/sidebar/SidebarHeader.svelte
index ff64fb72ceb..5161ace22b3 100644
--- a/web-common/src/features/chat/layouts/sidebar/SidebarHeader.svelte
+++ b/web-common/src/features/chat/layouts/sidebar/SidebarHeader.svelte
@@ -5,7 +5,7 @@
   import PlusIcon from "../../../../components/icons/PlusIcon.svelte";
   import { featureFlags } from "@rilldata/web-common/features/feature-flags";
   import { type V1Conversation } from "../../../../runtime-client";
-  import { runtime } from "../../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { ConversationManager } from "../../core/conversation-manager";
   import ShareChatPopover from "../../share/ShareChatPopover.svelte";
   import ConversationHistoryMenu from "./ConversationHistoryMenu.svelte";
@@ -16,7 +16,8 @@
 
   const { adminServer } = featureFlags;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+  $: instanceId = runtimeClient.instanceId;
   $: organization = $page.params.organization;
   $: project = $page.params.project;
 
diff --git a/web-common/src/features/connectors/code-utils.spec.ts b/web-common/src/features/connectors/code-utils.spec.ts
index 0f9f840b39f..1062b04fcbb 100644
--- a/web-common/src/features/connectors/code-utils.spec.ts
+++ b/web-common/src/features/connectors/code-utils.spec.ts
@@ -842,6 +842,7 @@ describe("updateDotEnvWithSecrets", () => {
       sql: "SELECT 1",
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -865,6 +866,7 @@ describe("updateDotEnvWithSecrets", () => {
       },
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -881,6 +883,7 @@ describe("updateDotEnvWithSecrets", () => {
     const connector: V1ConnectorDriver = { name: "clickhouse" };
     const formValues: Record<string, unknown> = { password: "new_pw" };
     const { newBlob, originalBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -898,6 +901,7 @@ describe("updateDotEnvWithSecrets", () => {
     const connector: V1ConnectorDriver = { name: "clickhouse" };
     const formValues: Record<string, unknown> = { password: "new_value" };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -915,6 +919,7 @@ describe("updateDotEnvWithSecrets", () => {
       dsn: undefined,
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -932,6 +937,7 @@ describe("updateDotEnvWithSecrets", () => {
       ],
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -949,6 +955,7 @@ describe("updateDotEnvWithSecrets", () => {
       headers: [{ key: "Authorization", value: "Bearer abc123" }],
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -965,6 +972,7 @@ describe("updateDotEnvWithSecrets", () => {
       headers: [{ key: "X-API-Key", value: "raw_api_key_value" }],
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -980,6 +988,7 @@ describe("updateDotEnvWithSecrets", () => {
       headers: [{ key: "Authorization", value: "Token secret_tok" }],
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -999,6 +1008,7 @@ describe("updateDotEnvWithSecrets", () => {
       ],
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
@@ -1010,6 +1020,7 @@ describe("updateDotEnvWithSecrets", () => {
   it("should invalidate cache before reading .env", async () => {
     const connector: V1ConnectorDriver = { name: "clickhouse" };
     await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       { password: "pw" },
@@ -1030,6 +1041,7 @@ describe("updateDotEnvWithSecrets", () => {
 
     const connector: V1ConnectorDriver = { name: "clickhouse" };
     const { newBlob, originalBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       { password: "pw" },
@@ -1047,6 +1059,7 @@ describe("updateDotEnvWithSecrets", () => {
     const connector: V1ConnectorDriver = { name: "clickhouse" };
     await expect(
       updateDotEnvWithSecrets(
+        "test-instance-id",
         mockQueryClient as any,
         connector,
         { password: "pw" },
@@ -1069,6 +1082,7 @@ describe("updateDotEnvWithSecrets", () => {
       dsn: "clickhouse://...",
     };
     const { newBlob } = await updateDotEnvWithSecrets(
+      "test-instance-id",
       mockQueryClient as any,
       connector,
       formValues,
diff --git a/web-common/src/features/connectors/code-utils.ts b/web-common/src/features/connectors/code-utils.ts
index 8a90f10aa27..88bd6b2f81b 100644
--- a/web-common/src/features/connectors/code-utils.ts
+++ b/web-common/src/features/connectors/code-utils.ts
@@ -1,12 +1,10 @@
 import { QueryClient } from "@tanstack/svelte-query";
-import { get } from "svelte/store";
 import {
   type V1ConnectorDriver,
   type ConnectorDriverProperty,
   getRuntimeServiceGetFileQueryKey,
   runtimeServiceGetFile,
 } from "../../runtime-client";
-import { runtime } from "../../runtime-client/runtime-store";
 import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
@@ -256,6 +254,7 @@ driver: ${driverName}`;
 }
 
 export async function updateDotEnvWithSecrets(
+  instanceId: string,
   queryClient: QueryClient,
   connector: V1ConnectorDriver,
   formValues: Record<string, unknown>,
@@ -264,8 +263,6 @@ export async function updateDotEnvWithSecrets(
     schema?: { properties?: Record<string, { "x-env-var-name"?: string }> };
   },
 ): Promise<{ newBlob: string; originalBlob: string }> {
-  const instanceId = get(runtime).instanceId;
-
   // Invalidate the cache to ensure we get fresh .env content
   // This prevents overwriting credentials added by a previous step
   await queryClient.invalidateQueries({
@@ -495,11 +492,11 @@ export function makeEnvVarKey(
 }
 
 export async function updateRillYAMLWithOlapConnector(
+  instanceId: string,
   queryClient: QueryClient,
   newConnector: string,
 ): Promise<string> {
   // Get the existing rill.yaml file
-  const instanceId = get(runtime).instanceId;
   const file = await queryClient.fetchQuery({
     queryKey: getRuntimeServiceGetFileQueryKey(instanceId, {
       path: "rill.yaml",
@@ -530,14 +527,13 @@ export function replaceOlapConnectorInYAML(
 }
 
 export async function createYamlModelFromTable(
+  instanceId: string,
   queryClient: QueryClient,
   connector: string,
   database: string,
   databaseSchema: string,
   table: string,
 ): Promise<[string, string]> {
-  const instanceId = get(runtime).instanceId;
-
   // Get driver name for makeSufficientlyQualifiedTableName
   const analyzeConnectorsQueryKey =
     getRuntimeServiceAnalyzeConnectorsQueryKey(instanceId);
@@ -601,6 +597,7 @@ export async function createYamlModelFromTable(
 }
 
 export async function createSqlModelFromTable(
+  instanceId: string,
   queryClient: QueryClient,
   connector: string,
   database: string,
@@ -608,8 +605,6 @@ export async function createSqlModelFromTable(
   table: string,
   addDevLimit: boolean = true,
 ): Promise<[string, string]> {
-  const instanceId = get(runtime).instanceId;
-
   // Get driver name
   const analyzeConnectorsQueryKey =
     getRuntimeServiceAnalyzeConnectorsQueryKey(instanceId);
diff --git a/web-common/src/features/connectors/explorer/TableMenuItems.svelte b/web-common/src/features/connectors/explorer/TableMenuItems.svelte
index b0ee5c8dc83..d60c462a6f3 100644
--- a/web-common/src/features/connectors/explorer/TableMenuItems.svelte
+++ b/web-common/src/features/connectors/explorer/TableMenuItems.svelte
@@ -53,6 +53,7 @@
     if (isModelingSupported) {
       await handleCreateModel(() =>
         createSqlModelFromTable(
+          instanceId,
           queryClient,
           connector,
           database,
@@ -63,6 +64,7 @@
     } else if (showGenerateModel) {
       await handleCreateModel(() =>
         createYamlModelFromTable(
+          instanceId,
           queryClient,
           connector,
           database,
@@ -75,6 +77,7 @@
 
   async function handleGenerateMetrics() {
     await generateMetricsFromTable(
+      client,
       instanceId,
       connector,
       database,
@@ -87,6 +90,7 @@
 
   async function handleGenerateDashboard() {
     await generateMetricsFromTable(
+      client,
       instanceId,
       connector,
       database,
diff --git a/web-common/src/features/connectors/explorer/TableWorkspaceHeader.svelte b/web-common/src/features/connectors/explorer/TableWorkspaceHeader.svelte
index 40c432e1331..3a3d1426c5c 100644
--- a/web-common/src/features/connectors/explorer/TableWorkspaceHeader.svelte
+++ b/web-common/src/features/connectors/explorer/TableWorkspaceHeader.svelte
@@ -24,6 +24,7 @@
   const client = useRuntimeClient();
 
   $: createMetricsViewFromTable = useCreateMetricsViewFromTableUIAction(
+    client,
     client.instanceId,
     connector,
     database,
diff --git a/web-common/src/features/dashboards/filters/ExploreFilterChipsReadOnly.svelte b/web-common/src/features/dashboards/filters/ExploreFilterChipsReadOnly.svelte
index 72a2c500544..7f7772b4e5d 100644
--- a/web-common/src/features/dashboards/filters/ExploreFilterChipsReadOnly.svelte
+++ b/web-common/src/features/dashboards/filters/ExploreFilterChipsReadOnly.svelte
@@ -6,6 +6,7 @@
     V1Expression,
     V1TimeRange,
   } from "@rilldata/web-common/runtime-client";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { writable } from "svelte/store";
 
   export let metricsViewNames: string[];
@@ -19,11 +20,16 @@
   export let queryTimeStart: string | undefined = undefined;
   export let queryTimeEnd: string | undefined = undefined;
 
+  const runtimeClient = useRuntimeClient();
+
   const metricsViewNamesStore = writable([] as string[]);
   $: metricsViewNamesStore.set(metricsViewNames);
 
   const combinedMeasuresAndDimensions =
-    getCombinedMeasuresAndDimensionsForMetricsViews(metricsViewNamesStore);
+    getCombinedMeasuresAndDimensionsForMetricsViews(
+      runtimeClient,
+      metricsViewNamesStore,
+    );
   $: ({ measures, dimensions } = $combinedMeasuresAndDimensions);
 </script>
 
diff --git a/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte b/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
index eb18e2ecd33..d5a5dd8d6b7 100644
--- a/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
+++ b/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
@@ -45,7 +45,7 @@
         active={viewAsMenuOpen}
         removeTooltipText="Clear view"
         onRemove={() => {
-          updateDevJWT(queryClient, null);
+          updateDevJWT(queryClient, instanceId, null);
         }}
       >
         <div slot="body">
@@ -62,7 +62,7 @@
       {#each $mockUsers.data as user (user?.email)}
         <DropdownMenu.Item
           on:click={() => {
-            updateDevJWT(queryClient, user);
+            updateDevJWT(queryClient, instanceId, user);
           }}
           class="flex gap-x-2 items-center"
         >
diff --git a/web-common/src/features/dashboards/granular-access-policies/resetSelectedMockUserAfterNavigate.ts b/web-common/src/features/dashboards/granular-access-policies/resetSelectedMockUserAfterNavigate.ts
index 7db87032c0e..e1c10eababf 100644
--- a/web-common/src/features/dashboards/granular-access-policies/resetSelectedMockUserAfterNavigate.ts
+++ b/web-common/src/features/dashboards/granular-access-policies/resetSelectedMockUserAfterNavigate.ts
@@ -13,7 +13,10 @@ import { get } from "svelte/store";
  * under this scenario, the catalog entry returns a 404, and it's required to enter the top-level
  * `Dashboard.svelte` component.
  */
-export function resetSelectedMockUserAfterNavigate(queryClient: QueryClient) {
+export function resetSelectedMockUserAfterNavigate(
+  queryClient: QueryClient,
+  instanceId: string,
+) {
   beforeNavigate(({ to, from }) => {
     if (!to?.params || !from?.params) return;
 
@@ -21,7 +24,7 @@ export function resetSelectedMockUserAfterNavigate(queryClient: QueryClient) {
       from.params.name !== to.params.name &&
       get(selectedMockUserStore) !== null
     ) {
-      updateDevJWT(queryClient, null).catch(console.error);
+      updateDevJWT(queryClient, instanceId, null).catch(console.error);
     }
   });
 }
diff --git a/web-common/src/features/dashboards/granular-access-policies/updateDevJWT.ts b/web-common/src/features/dashboards/granular-access-policies/updateDevJWT.ts
index da058a6a9a4..34440c8e10e 100644
--- a/web-common/src/features/dashboards/granular-access-policies/updateDevJWT.ts
+++ b/web-common/src/features/dashboards/granular-access-policies/updateDevJWT.ts
@@ -7,10 +7,10 @@ import { runtimeServiceIssueDevJWT } from "@rilldata/web-common/runtime-client";
 import { invalidateAllMetricsViews } from "@rilldata/web-common/runtime-client/invalidation";
 import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import type { QueryClient } from "@tanstack/svelte-query";
-import { get } from "svelte/store";
 
 export async function updateDevJWT(
   queryClient: QueryClient,
+  instanceId: string,
   mockUser: MockUser | null,
 ) {
   selectedMockUserStore.set(mockUser);
@@ -50,5 +50,5 @@ export async function updateDevJWT(
     }
   }
 
-  return invalidateAllMetricsViews(queryClient, get(runtime).instanceId);
+  return invalidateAllMetricsViews(queryClient, instanceId);
 }
diff --git a/web-common/src/features/editor/FileWorkspaceHeader.svelte b/web-common/src/features/editor/FileWorkspaceHeader.svelte
index 74544c99511..a4f1c596170 100644
--- a/web-common/src/features/editor/FileWorkspaceHeader.svelte
+++ b/web-common/src/features/editor/FileWorkspaceHeader.svelte
@@ -2,7 +2,9 @@
   import { goto } from "$app/navigation";
   import { splitFolderAndFileName } from "@rilldata/web-common/features/entity-management/file-path-utils";
   import { handleEntityRename } from "@rilldata/web-common/features/entity-management/ui-actions";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+
+  const runtimeClient = useRuntimeClient();
   import { WorkspaceHeader } from "../../layout/workspace";
   import type { ResourceKind } from "../entity-management/resource-selectors";
   import { PROTECTED_FILES } from "../file-explorer/protected-paths";
@@ -18,7 +20,7 @@
   $: [, fileName] = splitFolderAndFileName(filePath);
   $: isProtectedFile = PROTECTED_FILES.includes(filePath);
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   const onChangeCallback = async (newTitle: string) => {
     const route = await handleEntityRename(
diff --git a/web-common/src/features/entity-management/AddAssetButton.svelte b/web-common/src/features/entity-management/AddAssetButton.svelte
index be170347e06..e23b139d8ed 100644
--- a/web-common/src/features/entity-management/AddAssetButton.svelte
+++ b/web-common/src/features/entity-management/AddAssetButton.svelte
@@ -17,7 +17,7 @@
     createRuntimeServiceCreateDirectory,
     createRuntimeServicePutFile,
   } from "../../runtime-client";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import { useIsModelingSupportedForDefaultOlapDriverOLAP as useIsModelingSupportedForDefaultOlapDriver } from "../connectors/selectors";
   import { directoryState } from "../file-explorer/directory-store";
   import { createResourceAndNavigate } from "../file-explorer/new-files";
@@ -42,7 +42,8 @@
   const createFile = createRuntimeServicePutFile();
   const createFolder = createRuntimeServiceCreateDirectory();
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+  $: ({ instanceId } = runtimeClient);
   const { developerChat } = featureFlags;
 
   $: currentFile = $page.params.file;
@@ -173,7 +174,8 @@
       aria-label="Add Model"
       class="flex gap-x-2"
       disabled={!isModelingSupported}
-      on:click={() => createResourceAndNavigate(ResourceKind.Model)}
+      on:click={() =>
+        createResourceAndNavigate(runtimeClient, ResourceKind.Model)}
     >
       <svelte:component
         this={resourceIconMapping[ResourceKind.Model]}
@@ -191,7 +193,8 @@
     <DropdownMenu.Item
       aria-label="Add Metrics View"
       class="flex gap-x-2"
-      on:click={() => createResourceAndNavigate(ResourceKind.MetricsView)}
+      on:click={() =>
+        createResourceAndNavigate(runtimeClient, ResourceKind.MetricsView)}
     >
       <svelte:component
         this={resourceIconMapping[ResourceKind.MetricsView]}
@@ -207,6 +210,7 @@
       on:click={() => {
         if (metricsViews.length === 1) {
           void createResourceAndNavigate(
+            runtimeClient,
             ResourceKind.Explore,
             metricsViews.pop(),
           );
@@ -233,7 +237,8 @@
 
     <DropdownMenu.Item
       class="flex items-center justify-between gap-x-2"
-      on:click={() => createResourceAndNavigate(ResourceKind.Canvas)}
+      on:click={() =>
+        createResourceAndNavigate(runtimeClient, ResourceKind.Canvas)}
       disabled={metricsViews.length === 0}
     >
       <div class="flex gap-x-2 items-center">
@@ -273,7 +278,8 @@
         <DropdownMenu.Separator />
         <DropdownMenu.Item
           class="flex gap-x-2"
-          on:click={() => createResourceAndNavigate(ResourceKind.API)}
+          on:click={() =>
+            createResourceAndNavigate(runtimeClient, ResourceKind.API)}
         >
           <svelte:component
             this={resourceIconMapping[ResourceKind.API]}
@@ -285,7 +291,8 @@
         <DropdownMenu.Separator />
         <DropdownMenu.Item
           class="flex gap-x-2"
-          on:click={() => createResourceAndNavigate(ResourceKind.Theme)}
+          on:click={() =>
+            createResourceAndNavigate(runtimeClient, ResourceKind.Theme)}
         >
           <svelte:component
             this={resourceIconMapping[ResourceKind.Theme]}
@@ -294,7 +301,7 @@
           Theme
         </DropdownMenu.Item>
         <!-- Temporarily hide Report and Alert options -->
-        <!-- <DropdownMenu.Item class="flex gap-x-2" on:click={() => createResourceAndNavigate(ResourceKind.Report)}>
+        <!-- <DropdownMenu.Item class="flex gap-x-2" on:click={() => createResourceAndNavigate(runtimeClient, ResourceKind.Report)}>
             <svelte:component
               this={resourceIconMapping[ResourceKind.Report]}
               className="text-fg-primary"
@@ -302,7 +309,7 @@
             />
             Report
           </DropdownMenu.Item>
-          <DropdownMenu.Item class="flex gap-x-2" on:click={() => createResourceAndNavigate(ResourceKind.Alert)}>
+          <DropdownMenu.Item class="flex gap-x-2" on:click={() => createResourceAndNavigate(runtimeClient, ResourceKind.Alert)}>
             <svelte:component
               this={resourceIconMapping[ResourceKind.Alert]}
               className="text-fg-primary"
diff --git a/web-common/src/features/entity-management/CreateExploreDialog.svelte b/web-common/src/features/entity-management/CreateExploreDialog.svelte
index 0d246d655bd..7ae433c380f 100644
--- a/web-common/src/features/entity-management/CreateExploreDialog.svelte
+++ b/web-common/src/features/entity-management/CreateExploreDialog.svelte
@@ -4,11 +4,14 @@
   import Select from "@rilldata/web-common/components/forms/Select.svelte";
   import type { V1Resource } from "@rilldata/web-common/runtime-client";
   import { createResourceAndNavigate } from "../file-explorer/new-files";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import { ResourceKind } from "./resource-selectors";
 
   export let open = false;
   export let metricsViews: V1Resource[];
 
+  const runtimeClient = useRuntimeClient();
+
   let selectedMetricsView: V1Resource | undefined = undefined;
 
   $: metricsViewOptions = metricsViews.map((resource) => ({
@@ -54,6 +57,7 @@
           type="primary"
           onClick={() =>
             void createResourceAndNavigate(
+              runtimeClient,
               ResourceKind.Explore,
               selectedMetricsView,
             )}
diff --git a/web-common/src/features/entity-management/FileAndResourceWatcher.svelte b/web-common/src/features/entity-management/FileAndResourceWatcher.svelte
index 90afdc9a9a9..ee482a120d6 100644
--- a/web-common/src/features/entity-management/FileAndResourceWatcher.svelte
+++ b/web-common/src/features/entity-management/FileAndResourceWatcher.svelte
@@ -5,6 +5,7 @@
   import ErrorPage from "@rilldata/web-common/components/ErrorPage.svelte";
   import { fileAndResourceWatcher } from "./file-and-resource-watcher";
   import { ConnectionStatus } from "@rilldata/web-common/runtime-client/sse-connection-manager";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   const {
     status: statusStore,
@@ -12,9 +13,13 @@
     scheduleAutoClose,
   } = fileAndResourceWatcher;
 
+  const runtimeClient = useRuntimeClient();
+
   export let host: string;
   export let instanceId: string;
 
+  $: fileAndResourceWatcher.setInstanceId(instanceId);
+
   $: watcherEndpoint = `${host}/v1/instances/${instanceId}/sse?events=file,resource`;
 
   $: fileAndResourceWatcher.watch(watcherEndpoint);
@@ -22,7 +27,7 @@
   $: status = $statusStore;
 
   onMount(() => {
-    void fileArtifacts.init(queryClient, instanceId);
+    void fileArtifacts.init(runtimeClient, queryClient, instanceId);
 
     return () => fileAndResourceWatcher.close(true);
   });
diff --git a/web-common/src/features/entity-management/RenameAssetModal.svelte b/web-common/src/features/entity-management/RenameAssetModal.svelte
index 115877dcc1c..7a23bcf4178 100644
--- a/web-common/src/features/entity-management/RenameAssetModal.svelte
+++ b/web-common/src/features/entity-management/RenameAssetModal.svelte
@@ -13,7 +13,7 @@
   import { defaults, setError, superForm } from "sveltekit-superforms";
   import { yup } from "sveltekit-superforms/adapters";
   import { object, string } from "yup";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import { renameFileArtifact } from "./actions";
   import { removeLeadingSlash } from "./entity-mappers";
   import {
@@ -26,7 +26,9 @@
   export let filePath: string;
   export let isDir: boolean;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   let error: string;
 
diff --git a/web-common/src/features/entity-management/file-and-resource-watcher.ts b/web-common/src/features/entity-management/file-and-resource-watcher.ts
index 5742865f91c..9b44d53acf8 100644
--- a/web-common/src/features/entity-management/file-and-resource-watcher.ts
+++ b/web-common/src/features/entity-management/file-and-resource-watcher.ts
@@ -25,8 +25,6 @@ import {
   invalidateMetricsViewData,
   invalidateProfilingQueries,
 } from "@rilldata/web-common/runtime-client/invalidation";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { get } from "svelte/store";
 import { connectorExplorerStore } from "../connectors/explorer/connector-explorer-store";
 import { sourceIngestionTracker } from "../sources/sources-store";
 import { isLeafResource } from "./dag-utils";
@@ -134,8 +132,14 @@ export class FileAndResourceWatcher {
     });
   }
 
+  private _instanceId = "";
+
+  public setInstanceId(instanceId: string) {
+    this._instanceId = instanceId;
+  }
+
   private get instanceId() {
-    return get(runtime).instanceId;
+    return this._instanceId;
   }
 
   private invalidateAll() {
diff --git a/web-common/src/features/entity-management/file-artifact.ts b/web-common/src/features/entity-management/file-artifact.ts
index ae269f10da9..51a35fbc0b7 100644
--- a/web-common/src/features/entity-management/file-artifact.ts
+++ b/web-common/src/features/entity-management/file-artifact.ts
@@ -18,7 +18,7 @@ import {
   type V1Resource,
   type V1ResourceName,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { QueryClient, QueryFunction } from "@tanstack/svelte-query";
 import {
   derived,
@@ -91,15 +91,17 @@ export class FileArtifact {
   }> = writable({ scroll: undefined, selection: undefined });
 
   private editorCallback: (content: string) => void = () => {};
+  private readonly client: RuntimeClient;
 
   // Last time the state of the resource `kind/name` was updated.
   // This is updated in watch-resources and is used there to avoid
   // unnecessary calls to GetResource API.
   lastStateUpdatedOn: string | undefined;
 
-  constructor(filePath: string) {
+  constructor(client: RuntimeClient, filePath: string) {
     const [folderName, fileName] = splitFolderAndFileName(filePath);
 
+    this.client = client;
     this.path = filePath;
     this.folderName = folderName;
     this.fileName = fileName;
@@ -119,7 +121,7 @@ export class FileArtifact {
   }
 
   fetchContent = async (invalidate = false) => {
-    const instanceId = get(runtime).instanceId;
+    const instanceId = this.client.instanceId;
     const queryParams = {
       path: this.path,
     };
@@ -222,7 +224,7 @@ export class FileArtifact {
   };
 
   private saveContent = async (blob: string) => {
-    const instanceId = get(runtime).instanceId;
+    const instanceId = this.client.instanceId;
 
     // Optimistically update the query
     queryClient.setQueryData(
diff --git a/web-common/src/features/entity-management/file-artifacts.ts b/web-common/src/features/entity-management/file-artifacts.ts
index 0be89adcdc1..20473e8d7bc 100644
--- a/web-common/src/features/entity-management/file-artifacts.ts
+++ b/web-common/src/features/entity-management/file-artifacts.ts
@@ -7,6 +7,7 @@ import {
   type V1Resource,
   type V1ResourceName,
 } from "@rilldata/web-common/runtime-client";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { QueryClient } from "@tanstack/svelte-query";
 import { derived, get, writable } from "svelte/store";
 import { FileArtifact } from "./file-artifact";
@@ -36,8 +37,14 @@ class UnsavedFilesStore {
 export class FileArtifacts {
   private readonly artifacts: Map<string, FileArtifact> = new Map();
   readonly unsavedFiles = new UnsavedFilesStore();
+  private client!: RuntimeClient;
 
-  async init(queryClient: QueryClient, instanceId: string) {
+  async init(
+    client: RuntimeClient,
+    queryClient: QueryClient,
+    instanceId: string,
+  ) {
+    this.client = client;
     const resources = await fetchResources(queryClient, instanceId);
     for (const resource of resources) {
       switch (resource.meta?.name?.kind) {
@@ -90,7 +97,7 @@ export class FileArtifacts {
     let artifact = this.artifacts.get(filePath);
 
     if (!artifact) {
-      artifact = new FileArtifact(filePath);
+      artifact = new FileArtifact(this.client, filePath);
       this.artifacts.set(filePath, artifact);
     }
 
diff --git a/web-common/src/features/entity-management/resource-selectors.ts b/web-common/src/features/entity-management/resource-selectors.ts
index 0a97b1f9218..9a987c7995f 100644
--- a/web-common/src/features/entity-management/resource-selectors.ts
+++ b/web-common/src/features/entity-management/resource-selectors.ts
@@ -17,8 +17,7 @@ import {
 import type { CreateQueryOptions, QueryClient } from "@tanstack/svelte-query";
 import type { ErrorType } from "../../runtime-client/http-client";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
-import { derived } from "svelte/store";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
 export enum ResourceKind {
   ProjectParser = "rill.runtime.v1.ProjectParser",
@@ -266,18 +265,21 @@ export function useClientFilteredResources(
  * Query options version of {@link useClientFilteredResources}.
  */
 export function getClientFilteredResourcesQueryOptions(
+  client: RuntimeClient,
   kind: ResourceKind,
   filter: (res: V1Resource) => boolean = () => true,
 ) {
-  return derived(runtime, ({ instanceId }) =>
-    getRuntimeServiceListResourcesQueryOptions(instanceId, undefined, {
+  return getRuntimeServiceListResourcesQueryOptions(
+    client.instanceId,
+    undefined,
+    {
       query: {
         select: (data) =>
           data.resources?.filter(
             (res) => res.meta?.name?.kind === kind && filter(res),
           ) ?? [],
       },
-    }),
+    },
   );
 }
 
@@ -324,9 +326,13 @@ export type MetricsViewAndExploreSpecs = {
   exploreSpecsMap: Map<string, V1ExploreSpec>;
   exploreForMetricViewsMap: Map<string, string>;
 };
-export function getMetricsViewAndExploreSpecsQueryOptions() {
-  return derived(runtime, ({ instanceId }) =>
-    getRuntimeServiceListResourcesQueryOptions(instanceId, undefined, {
+export function getMetricsViewAndExploreSpecsQueryOptions(
+  client: RuntimeClient,
+) {
+  return getRuntimeServiceListResourcesQueryOptions(
+    client.instanceId,
+    undefined,
+    {
       query: {
         select: (data) => {
           const metricsViewSpecsMap = new Map<string, V1MetricsViewSpec>();
@@ -355,6 +361,6 @@ export function getMetricsViewAndExploreSpecsQueryOptions() {
           } satisfies MetricsViewAndExploreSpecs;
         },
       },
-    }),
+    },
   );
 }
diff --git a/web-common/src/features/explore-mappers/generate-explore-link.ts b/web-common/src/features/explore-mappers/generate-explore-link.ts
index 006403f0849..9b969a6274e 100644
--- a/web-common/src/features/explore-mappers/generate-explore-link.ts
+++ b/web-common/src/features/explore-mappers/generate-explore-link.ts
@@ -8,6 +8,7 @@ import { EmbedStore } from "@rilldata/web-common/features/embeds/embed-store.ts"
  * Generates the explore page URL with proper search parameters
  */
 export async function generateExploreLink(
+  instanceId: string,
   exploreState: Partial<ExploreState>,
   exploreName: string,
   organization?: string | undefined,
@@ -19,6 +20,7 @@ export async function generateExploreLink(
 
     // Generate search parameters from explore state
     const searchParams = await getExplorePageUrlSearchParams(
+      instanceId,
       exploreName,
       exploreState,
     );
diff --git a/web-common/src/features/explore-mappers/get-dashboard-from-aggregation-request.spec.ts b/web-common/src/features/explore-mappers/get-dashboard-from-aggregation-request.spec.ts
index 66622417b15..475cfd44e2f 100644
--- a/web-common/src/features/explore-mappers/get-dashboard-from-aggregation-request.spec.ts
+++ b/web-common/src/features/explore-mappers/get-dashboard-from-aggregation-request.spec.ts
@@ -340,6 +340,7 @@ async function runTest({
   forceOpenPivot: boolean;
 }) {
   const mapQueryStore = mapQueryToDashboard(
+    "default",
     {
       exploreName: AD_BIDS_EXPLORE_NAME,
       queryName: "MetricsViewAggregation",
diff --git a/web-common/src/features/explore-mappers/get-dashboard-from-aggregation-request.ts b/web-common/src/features/explore-mappers/get-dashboard-from-aggregation-request.ts
index 7e1cb9cee10..d481386808f 100644
--- a/web-common/src/features/explore-mappers/get-dashboard-from-aggregation-request.ts
+++ b/web-common/src/features/explore-mappers/get-dashboard-from-aggregation-request.ts
@@ -76,6 +76,7 @@ export async function getDashboardFromAggregationRequest({
   }
 
   await fillTimeRange(
+    instanceId,
     explore,
     dashboard,
     req.timeRange,
diff --git a/web-common/src/features/explore-mappers/get-dashboard-from-comparison-request.ts b/web-common/src/features/explore-mappers/get-dashboard-from-comparison-request.ts
index 75814882508..13dc0e6fe94 100644
--- a/web-common/src/features/explore-mappers/get-dashboard-from-comparison-request.ts
+++ b/web-common/src/features/explore-mappers/get-dashboard-from-comparison-request.ts
@@ -9,6 +9,7 @@ import {
 } from "@rilldata/web-common/runtime-client";
 
 export async function getDashboardFromComparisonRequest({
+  instanceId,
   req,
   dashboard,
   metricsView,
@@ -19,6 +20,7 @@ export async function getDashboardFromComparisonRequest({
   if (req.where) dashboard.whereFilter = req.where;
 
   await fillTimeRange(
+    instanceId,
     explore,
     dashboard,
     req.timeRange,
diff --git a/web-common/src/features/explore-mappers/get-mapped-explore-url.ts b/web-common/src/features/explore-mappers/get-mapped-explore-url.ts
index c0b6c2a1d41..aa68fee3e8c 100644
--- a/web-common/src/features/explore-mappers/get-mapped-explore-url.ts
+++ b/web-common/src/features/explore-mappers/get-mapped-explore-url.ts
@@ -44,7 +44,7 @@ export function getMappedExploreUrl(
         undefined,
         queryClient,
       ),
-      mapQueryToDashboard(req, opts),
+      mapQueryToDashboard(instanceId, req, opts),
       page,
     ],
     ([validSpecResp, timeRangeSummaryResp, dashboardState, pageState]) => {
diff --git a/web-common/src/features/explore-mappers/map-to-explore.ts b/web-common/src/features/explore-mappers/map-to-explore.ts
index 64c2847e69b..ea46b9c81ba 100644
--- a/web-common/src/features/explore-mappers/map-to-explore.ts
+++ b/web-common/src/features/explore-mappers/map-to-explore.ts
@@ -16,8 +16,7 @@ import {
   type V1MetricsViewAggregationRequest,
   type V1MetricsViewComparisonRequest,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { derived, get, readable, type Readable } from "svelte/store";
+import { derived, readable, type Readable } from "svelte/store";
 
 export type MapQueryRequest = {
   exploreName: string;
@@ -44,6 +43,7 @@ export type MapQueryResponse = {
  * Used to show the relevant dashboard for a report/alert.
  */
 export function mapQueryToDashboard(
+  instanceId: string,
   { exploreName, queryName, queryArgsJson, executionTime }: MapQueryRequest,
   {
     exploreProtoState,
@@ -103,14 +103,12 @@ export function mapQueryToDashboard(
   // backwards compatibility for older alerts created on metrics explore directly
   if (!exploreName) exploreName = metricsViewName;
 
-  const instanceId = get(runtime).instanceId;
-
   return derived(
     [
       useExploreValidSpec(instanceId, exploreName, undefined, queryClient),
       // TODO: handle non-timestamp dashboards
       createQueryServiceMetricsViewTimeRange(
-        get(runtime).instanceId,
+        instanceId,
         metricsViewName,
         {},
         undefined,
diff --git a/web-common/src/features/explore-mappers/utils.ts b/web-common/src/features/explore-mappers/utils.ts
index 69ce1e57001..b96c97fb726 100644
--- a/web-common/src/features/explore-mappers/utils.ts
+++ b/web-common/src/features/explore-mappers/utils.ts
@@ -32,9 +32,6 @@ import {
   type V1TimeRange,
   type V1TimeRangeSummary,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { get } from "svelte/store";
-
 // We are manually sending in duration, offset and round to grain for previous complete ranges.
 // This is to map back that split
 const PreviousCompleteRangeReverseMap: Record<string, TimeRangePreset> = {};
@@ -46,6 +43,7 @@ for (const preset in PreviousCompleteRangeMap) {
 }
 
 export async function fillTimeRange(
+  instanceId: string,
   exploreSpec: V1ExploreSpec,
   exploreState: ExploreState,
   reqTimeRange: V1TimeRange | undefined,
@@ -102,7 +100,7 @@ export async function fillTimeRange(
   // Resolve time range overriding ref to `executionTime` and set to custom.
   // This keeps the time range consistent regardless of when the link is opened.
   [exploreState.selectedTimeRange] = await resolveTimeRanges(
-    get(runtime).instanceId,
+    instanceId,
     exploreSpec,
     [exploreState.selectedTimeRange],
     exploreState.selectedTimezone,
@@ -148,10 +146,10 @@ export async function convertQueryFilterToToplistQuery(
 }
 
 export async function getExplorePageUrlSearchParams(
+  instanceId: string,
   exploreName: string,
   exploreState: Partial<ExploreState>,
 ): Promise<URLSearchParams> {
-  const instanceId = get(runtime).instanceId;
   const { explore, metricsView } = await queryClient.fetchQuery({
     queryFn: ({ signal }) =>
       runtimeServiceGetExplore(
@@ -217,11 +215,11 @@ export async function getExplorePageUrlSearchParams(
  * @param exploreSpec
  */
 export function maybeGetExplorePageUrlSearchParams(
+  instanceId: string,
   exploreState: Partial<ExploreState>,
   metricsViewSpec: V1MetricsViewSpec,
   exploreSpec: V1ExploreSpec,
 ) {
-  const instanceId = get(runtime).instanceId;
   const metricsViewName = exploreSpec.metricsView ?? "";
 
   const metricsViewTimeRangeQueryKey =
diff --git a/web-common/src/features/explores/explore-link/ExploreLink.svelte b/web-common/src/features/explores/explore-link/ExploreLink.svelte
index 6dd2b6f2170..b1ace496875 100644
--- a/web-common/src/features/explores/explore-link/ExploreLink.svelte
+++ b/web-common/src/features/explores/explore-link/ExploreLink.svelte
@@ -12,6 +12,9 @@
   } from "@rilldata/web-common/features/explore-mappers/types";
   import { getErrorMessage } from "@rilldata/web-common/features/explore-mappers/utils";
   import type { ExploreState } from "@rilldata/web-common/features/dashboards/stores/explore-state";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+
+  const runtimeClient = useRuntimeClient();
 
   export let exploreName: string;
   export let displayName: string | undefined = undefined;
@@ -32,6 +35,7 @@
 
     try {
       const exploreURL = await generateExploreLink(
+        runtimeClient.instanceId,
         exploreState,
         exploreName,
         organization,
diff --git a/web-common/src/features/exports/ExportMenu.svelte b/web-common/src/features/exports/ExportMenu.svelte
index 336fa54510e..9c77f6f575a 100644
--- a/web-common/src/features/exports/ExportMenu.svelte
+++ b/web-common/src/features/exports/ExportMenu.svelte
@@ -11,12 +11,13 @@
     V1ExportFormat,
     type V1Query,
   } from "@rilldata/web-common/runtime-client";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { onMount } from "svelte";
-  import { get } from "svelte/store";
-  import { runtime } from "../../runtime-client/runtime-store";
   import type TScheduledReportDialog from "../scheduled-reports/ScheduledReportDialog.svelte";
   import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 
+  const runtimeClient = useRuntimeClient();
+
   export let disabled: boolean = false;
   export let workspace = false;
   export let label: string;
@@ -46,7 +47,7 @@
   }) {
     const { format, includeHeader = false } = options;
     const result = await $exportDash.mutateAsync({
-      instanceId: get(runtime).instanceId,
+      instanceId: runtimeClient.instanceId,
       data: {
         query: exportQuery,
         format,
@@ -59,7 +60,7 @@
           }),
       },
     });
-    const downloadUrl = `${get(runtime).host}${result.downloadUrlPath}`;
+    const downloadUrl = `${runtimeClient.host}${result.downloadUrlPath}`;
     window.open(downloadUrl, "_self");
   }
 
diff --git a/web-common/src/features/file-explorer/FileExplorer.svelte b/web-common/src/features/file-explorer/FileExplorer.svelte
index 73f1543af99..21a67df1379 100644
--- a/web-common/src/features/file-explorer/FileExplorer.svelte
+++ b/web-common/src/features/file-explorer/FileExplorer.svelte
@@ -18,7 +18,7 @@
   import { PROTECTED_DIRECTORIES } from "@rilldata/web-common/features/file-explorer/protected-paths";
   import { isCurrentActivePage } from "@rilldata/web-common/features/file-explorer/utils";
   import { createRuntimeServiceListFiles } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { eventBus } from "../../lib/event-bus/event-bus";
   import { fileArtifacts } from "../entity-management/file-artifacts";
   import NavDirectory from "./NavDirectory.svelte";
@@ -27,7 +27,9 @@
 
   export let hasUnsaved: boolean;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
   $: getFileTree = createRuntimeServiceListFiles(instanceId, undefined, {
     query: {
       select: (data) => {
diff --git a/web-common/src/features/file-explorer/NavDirectoryEntry.svelte b/web-common/src/features/file-explorer/NavDirectoryEntry.svelte
index 931dd9f1151..931eda2d23a 100644
--- a/web-common/src/features/file-explorer/NavDirectoryEntry.svelte
+++ b/web-common/src/features/file-explorer/NavDirectoryEntry.svelte
@@ -16,7 +16,7 @@
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { Folder } from "lucide-svelte";
   import { createRuntimeServiceCreateDirectory } from "../../runtime-client";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import { removeLeadingSlash } from "../entity-management/entity-mappers";
   import { getTopLevelFolder } from "../entity-management/file-path-utils";
   import { useDirectoryNamesInDirectory } from "../entity-management/file-selectors";
@@ -28,6 +28,8 @@
   export let onDelete: (filePath: string, isDir: boolean) => void;
   export let onMouseDown: (e: MouseEvent, dragData: NavDragData) => void;
 
+  const runtimeClient = useRuntimeClient();
+
   let contextMenuOpen = false;
 
   const createFolder = createRuntimeServiceCreateDirectory();
@@ -35,7 +37,7 @@
   $: id = `${dir.path}-nav-entry`;
   $: expanded = $directoryState[dir.path];
   $: padding = getPaddingFromPath(dir.path);
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
   $: topLevelFolder = getTopLevelFolder(dir.path);
   $: isProtectedDirectory = PROTECTED_DIRECTORIES.includes(topLevelFolder);
 
diff --git a/web-common/src/features/file-explorer/NavFile.svelte b/web-common/src/features/file-explorer/NavFile.svelte
index 22fd13b2aab..75d3b601c2e 100644
--- a/web-common/src/features/file-explorer/NavFile.svelte
+++ b/web-common/src/features/file-explorer/NavFile.svelte
@@ -22,7 +22,7 @@
     ResourceKindToScreenMap,
   } from "@rilldata/web-common/metrics/service/MetricsTypes";
   import type { V1ResourceName } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { Save } from "lucide-svelte";
   import type { Readable } from "svelte/store";
   import CopyIcon from "../../components/icons/CopyIcon.svelte";
@@ -43,6 +43,8 @@
   export let onDelete: (filePath: string, isDir: boolean) => void;
   export let onMouseDown: (e: MouseEvent, dragData: NavDragData) => void;
 
+  const runtimeClient = useRuntimeClient();
+
   let contextMenuOpen = false;
   let resourceName: Readable<V1ResourceName | undefined>;
 
@@ -61,7 +63,7 @@
     saveState: { saving, error },
   } = fileArtifact);
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: resourceKind = ($resourceName?.kind ??
     $inferredResourceKind) as ResourceKind;
diff --git a/web-common/src/features/file-explorer/new-files.ts b/web-common/src/features/file-explorer/new-files.ts
index e19b748b08c..87d9f952bf5 100644
--- a/web-common/src/features/file-explorer/new-files.ts
+++ b/web-common/src/features/file-explorer/new-files.ts
@@ -9,8 +9,7 @@ import {
   runtimeServicePutFile,
   type V1Resource,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { get } from "svelte/store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { getScreenNameFromPage } from "@rilldata/web-common/features/file-explorer/telemetry.ts";
 import { behaviourEvent } from "@rilldata/web-common/metrics/initMetrics.ts";
 import {
@@ -20,10 +19,11 @@ import {
 import { MetricsEventSpace } from "@rilldata/web-common/metrics/service/MetricsTypes.ts";
 
 export async function createResourceAndNavigate(
+  client: RuntimeClient,
   kind: ResourceKind,
   baseResource?: V1Resource,
 ) {
-  const filePath = await createResourceFile(kind, baseResource);
+  const filePath = await createResourceFile(client, kind, baseResource);
   if (!filePath) return;
 
   const previousScreenName = getScreenNameFromPage();
@@ -37,6 +37,7 @@ export async function createResourceAndNavigate(
 }
 
 export async function createResourceFile(
+  client: RuntimeClient,
   kind: ResourceKind,
   baseResource?: V1Resource,
 ): Promise<string> {
@@ -45,7 +46,7 @@ export async function createResourceFile(
   }
 
   const newPath = getPathForNewResourceFile(kind, baseResource);
-  const instanceId = get(runtime).instanceId;
+  const instanceId = client.instanceId;
 
   await runtimeServicePutFile(instanceId, {
     path: newPath,
diff --git a/web-common/src/features/metrics-views/GoToDashboardButton.svelte b/web-common/src/features/metrics-views/GoToDashboardButton.svelte
index 5e0d70a7f7b..ef840ea1b52 100644
--- a/web-common/src/features/metrics-views/GoToDashboardButton.svelte
+++ b/web-common/src/features/metrics-views/GoToDashboardButton.svelte
@@ -7,7 +7,7 @@
   import { featureFlags } from "@rilldata/web-common/features/feature-flags";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import type { V1Resource } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useGetExploresForMetricsView } from "../dashboards/selectors";
   import { allowPrimary } from "../dashboards/workspace/DeployProjectCTA.svelte";
   import { createCanvasDashboardFromMetricsView } from "./ai-generation/generateMetricsView";
@@ -16,9 +16,10 @@
 
   export let resource: V1Resource | undefined;
 
+  const runtimeClient = useRuntimeClient();
   const { ai, generateCanvas } = featureFlags;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
   $: dashboardsQuery = useGetExploresForMetricsView(
     instanceId,
     resource?.meta?.name?.name ?? "",
@@ -48,7 +49,12 @@
       disabled={!resource}
       onClick={async () => {
         if (resource)
-          await createAndPreviewExplore(queryClient, instanceId, resource);
+          await createAndPreviewExplore(
+            runtimeClient,
+            queryClient,
+            instanceId,
+            resource,
+          );
       }}
     >
       Generate Explore Dashboard{$ai ? " with AI" : ""}
@@ -91,7 +97,12 @@
         <DropdownMenu.Item
           on:click={async () => {
             if (resource)
-              await createAndPreviewExplore(queryClient, instanceId, resource);
+              await createAndPreviewExplore(
+                runtimeClient,
+                queryClient,
+                instanceId,
+                resource,
+              );
           }}
         >
           <Add />
diff --git a/web-common/src/features/metrics-views/MetricsInspector.svelte b/web-common/src/features/metrics-views/MetricsInspector.svelte
index 71385c18f19..e1d1045ff8a 100644
--- a/web-common/src/features/metrics-views/MetricsInspector.svelte
+++ b/web-common/src/features/metrics-views/MetricsInspector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useQueryClient } from "@tanstack/svelte-query";
   import SimpleMessage from "../../layout/inspector/SimpleMessage.svelte";
   import { createConnectorServiceOLAPGetTable } from "../../runtime-client";
@@ -8,6 +8,7 @@
   import { fileArtifacts } from "../entity-management/file-artifacts";
   import Inspector from "@rilldata/web-common/layout/workspace/Inspector.svelte";
 
+  const runtimeClient = useRuntimeClient();
   const queryClient = useQueryClient();
 
   export let filePath: string;
@@ -16,7 +17,7 @@
   export let databaseSchema: string;
   export let table: string;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: fileArtifact = fileArtifacts.getFileArtifact(filePath);
   $: ({ remoteContent } = fileArtifact);
diff --git a/web-common/src/features/metrics-views/MetricsViewMenuItems.svelte b/web-common/src/features/metrics-views/MetricsViewMenuItems.svelte
index bc001ff742d..631cef00dde 100644
--- a/web-common/src/features/metrics-views/MetricsViewMenuItems.svelte
+++ b/web-common/src/features/metrics-views/MetricsViewMenuItems.svelte
@@ -16,18 +16,19 @@
     MetricsEventScreenName,
     MetricsEventSpace,
   } from "@rilldata/web-common/metrics/service/MetricsTypes";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { GitBranch, WandIcon } from "lucide-svelte";
   import { createCanvasDashboardFromMetricsView } from "./ai-generation/generateMetricsView";
   import { createAndPreviewExplore } from "./create-and-preview-explore";
 
+  const runtimeClient = useRuntimeClient();
   const { ai, generateCanvas } = featureFlags;
 
   export let filePath: string;
 
   $: fileArtifact = fileArtifacts.getFileArtifact(filePath);
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
   $: resourceQuery = fileArtifact.getResource(queryClient, instanceId);
   $: resource = $resourceQuery.data;
 
@@ -107,7 +108,12 @@
   {#if resource}
     <NavigationMenuItem
       on:click={() =>
-        createAndPreviewExplore(queryClient, instanceId, resource)}
+        createAndPreviewExplore(
+          runtimeClient,
+          queryClient,
+          instanceId,
+          resource,
+        )}
     >
       <ExploreIcon slot="icon" />
       <div class="flex gap-x-2 items-center">
diff --git a/web-common/src/features/metrics-views/ai-generation/generateMetricsView.ts b/web-common/src/features/metrics-views/ai-generation/generateMetricsView.ts
index 2b4ba5fbb86..d7d1e2bf7a8 100644
--- a/web-common/src/features/metrics-views/ai-generation/generateMetricsView.ts
+++ b/web-common/src/features/metrics-views/ai-generation/generateMetricsView.ts
@@ -3,6 +3,7 @@ import { pollForFileCreation } from "@rilldata/web-common/features/entity-manage
 import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { createResourceFile } from "@rilldata/web-common/features/file-explorer/new-files";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { getScreenNameFromPage } from "@rilldata/web-common/features/file-explorer/telemetry";
 import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
 import type { QueryClient } from "@tanstack/svelte-query";
@@ -56,6 +57,7 @@ const runtimeServiceGenerateMetricsViewFileWithSignal = (
  * This function is to be called from all `Generate dashboard with AI` CTAs *outside* of the Metrics Editor.
  */
 export function useCreateMetricsViewFromTableUIAction(
+  client: RuntimeClient,
   instanceId: string,
   connector: string,
   database: string,
@@ -155,7 +157,7 @@ export function useCreateMetricsViewFromTableUIAction(
       }
 
       // Create the Explore file, and navigate to it
-      await createAndPreviewExplore(queryClient, instanceId, resource);
+      await createAndPreviewExplore(client, queryClient, instanceId, resource);
     } catch (err) {
       eventBus.emit("notification", {
         message:
@@ -252,6 +254,7 @@ export async function createDashboardFromTableInMetricsEditor(
  * Handles both OLAP and non-OLAP connectors with appropriate logic for each case.
  */
 export async function generateMetricsFromTable(
+  client: RuntimeClient,
   instanceId: string,
   connector: string,
   database: string,
@@ -265,6 +268,7 @@ export async function generateMetricsFromTable(
   if (isOlapConnector) {
     // For OLAP connectors, use direct metrics view generation
     const createMetricsViewFromTable = useCreateMetricsViewFromTableUIAction(
+      client,
       instanceId,
       connector,
       database,
@@ -278,6 +282,7 @@ export async function generateMetricsFromTable(
   } else {
     // For non-OLAP connectors, follow Rill architecture: Model → Metrics → (Optional) Explore
     await createModelAndMetricsAndExplore(
+      client,
       instanceId,
       connector,
       database,
@@ -296,6 +301,7 @@ export async function generateMetricsFromTable(
  * 3. Optionally create explore dashboard (on top of metrics view)
  */
 export async function createModelAndMetricsAndExplore(
+  client: RuntimeClient,
   instanceId: string,
   connector: string,
   database: string,
@@ -336,6 +342,7 @@ export async function createModelAndMetricsAndExplore(
     });
 
     const [, modelName] = await createYamlModelFromTable(
+      instanceId,
       queryClient,
       connector,
       database,
@@ -455,7 +462,7 @@ export async function createModelAndMetricsAndExplore(
     });
 
     // Step 5: Create explore dashboard
-    await createAndPreviewExplore(queryClient, instanceId, resource);
+    await createAndPreviewExplore(client, queryClient, instanceId, resource);
   } catch (err) {
     console.error("Failed to create model and metrics view:", err);
     throw err;
@@ -538,12 +545,14 @@ async function createMetricsViewFromTable(
  * Returns the file path of the created explore.
  */
 export async function createExploreWithoutNavigation(
+  client: RuntimeClient,
   queryClient: QueryClient,
   instanceId: string,
   metricsViewResource: V1Resource,
 ): Promise<string> {
   // Create the Explore file
   const filePath = await createResourceFile(
+    client,
     ResourceKind.Explore,
     metricsViewResource,
   );
@@ -627,6 +636,7 @@ export async function createCanvasDashboardWithoutNavigation(
  * to create Canvas dashboard only (without Explore).
  */
 export function useCreateMetricsViewWithCanvasUIAction(
+  client: RuntimeClient,
   instanceId: string,
   connector: string,
   database: string,
@@ -718,6 +728,7 @@ export function useCreateMetricsViewWithCanvasUIAction(
  * This function is to be called from "Generate dashboard" CTA when canvas feature is enabled.
  */
 export function useCreateMetricsViewWithCanvasAndExploreUIAction(
+  client: RuntimeClient,
   instanceId: string,
   connector: string,
   database: string,
@@ -778,6 +789,7 @@ export function useCreateMetricsViewWithCanvasAndExploreUIAction(
       });
 
       exploreFilePath = await createExploreWithoutNavigation(
+        client,
         queryClient,
         instanceId,
         resource,
diff --git a/web-common/src/features/metrics-views/create-and-preview-explore.ts b/web-common/src/features/metrics-views/create-and-preview-explore.ts
index 0a5c2d1f99f..e15010933e2 100644
--- a/web-common/src/features/metrics-views/create-and-preview-explore.ts
+++ b/web-common/src/features/metrics-views/create-and-preview-explore.ts
@@ -3,17 +3,20 @@ import type { QueryClient } from "@tanstack/svelte-query";
 import { get } from "svelte/store";
 import { waitUntil } from "../../lib/waitUtils";
 import type { V1Resource } from "../../runtime-client";
+import type { RuntimeClient } from "../../runtime-client/v2";
 import { fileArtifacts } from "../entity-management/file-artifacts";
 import { ResourceKind } from "../entity-management/resource-selectors";
 import { createResourceFile } from "../file-explorer/new-files";
 
 export async function createAndPreviewExplore(
+  client: RuntimeClient,
   queryClient: QueryClient,
   instanceId: string,
   metricsViewResource: V1Resource,
 ) {
   // Create the Explore file
   const filePath = await createResourceFile(
+    client,
     ResourceKind.Explore,
     metricsViewResource,
   );
diff --git a/web-common/src/features/metrics-views/editor/Placeholder.svelte b/web-common/src/features/metrics-views/editor/Placeholder.svelte
index 0a26e9c45a8..4b0821b2124 100644
--- a/web-common/src/features/metrics-views/editor/Placeholder.svelte
+++ b/web-common/src/features/metrics-views/editor/Placeholder.svelte
@@ -7,7 +7,7 @@
     type V1Resource,
     runtimeServicePutFile,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { useIsModelingSupportedForDefaultOlapDriverOLAP as useIsModelingSupportedForDefaultOlapDriver } from "../../connectors/selectors";
   import { createDashboardFromTableInMetricsEditor } from "../ai-generation/generateMetricsView";
 
@@ -15,7 +15,9 @@
   export let filePath: string;
   export let view: EditorView | undefined = undefined;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   $: isModelingSupportedForDefaultOlapDriver =
     useIsModelingSupportedForDefaultOlapDriver(instanceId);
diff --git a/web-common/src/features/metrics-views/get-combined-measures-and-dimensions-for-metrics-views.ts b/web-common/src/features/metrics-views/get-combined-measures-and-dimensions-for-metrics-views.ts
index f8b9c8dbda9..d332285c52b 100644
--- a/web-common/src/features/metrics-views/get-combined-measures-and-dimensions-for-metrics-views.ts
+++ b/web-common/src/features/metrics-views/get-combined-measures-and-dimensions-for-metrics-views.ts
@@ -4,18 +4,19 @@ import {
   type MetricsViewSpecDimension,
   type MetricsViewSpecMeasure,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { createQueries } from "@tanstack/svelte-query";
 import { derived, type Readable } from "svelte/store";
 
 export function getCombinedMeasuresAndDimensionsForMetricsViews(
+  client: RuntimeClient,
   metricsViewNamesStore: Readable<string[]>,
 ) {
   const metricsViewQueryOptions = derived(
-    [runtime, metricsViewNamesStore],
-    ([{ instanceId }, metricsViewNames]) =>
+    metricsViewNamesStore,
+    (metricsViewNames) =>
       metricsViewNames.map((metricsViewName) =>
-        getRuntimeServiceGetResourceQueryOptions(instanceId, {
+        getRuntimeServiceGetResourceQueryOptions(client.instanceId, {
           "name.kind": ResourceKind.MetricsView,
           "name.name": metricsViewName,
         }),
diff --git a/web-common/src/features/models/incremental/ModelRefreshButton.svelte b/web-common/src/features/models/incremental/ModelRefreshButton.svelte
index a6dee7e8636..7cd7cc3b5dd 100644
--- a/web-common/src/features/models/incremental/ModelRefreshButton.svelte
+++ b/web-common/src/features/models/incremental/ModelRefreshButton.svelte
@@ -9,14 +9,15 @@
     type V1Resource,
     createRuntimeServiceCreateTrigger,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
 
   export let resource: V1Resource | undefined;
   export let hasUnsavedChanges: boolean;
 
+  const runtimeClient = useRuntimeClient();
   const triggerMutation = createRuntimeServiceCreateTrigger();
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
   $: isIncrementalModel = resource?.model?.spec?.incremental;
   $: isModelIdle =
     resource?.meta?.reconcileStatus === V1ReconcileStatus.RECONCILE_STATUS_IDLE;
diff --git a/web-common/src/features/models/navigation/ModelMenuItems.svelte b/web-common/src/features/models/navigation/ModelMenuItems.svelte
index e10c2e00154..0e58ad46985 100644
--- a/web-common/src/features/models/navigation/ModelMenuItems.svelte
+++ b/web-common/src/features/models/navigation/ModelMenuItems.svelte
@@ -17,7 +17,7 @@
   import Model from "../../../components/icons/Model.svelte";
   import { behaviourEvent } from "../../../metrics/initMetrics";
   import { V1ReconcileStatus } from "../../../runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { createSqlModelFromTable } from "../../connectors/code-utils";
   import { getScreenNameFromPage } from "../../file-explorer/telemetry";
   import {
@@ -25,12 +25,13 @@
     useCreateMetricsViewWithCanvasUIAction,
   } from "../../metrics-views/ai-generation/generateMetricsView";
 
+  const runtimeClient = useRuntimeClient();
   const { ai, generateCanvas } = featureFlags;
   const queryClient = useQueryClient();
 
   export let filePath: string;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: fileArtifact = fileArtifacts.getFileArtifact(filePath);
 
@@ -59,6 +60,7 @@
       const previousActiveEntity = getScreenNameFromPage();
       const addDevLimit = false; // Typically, the `dev` limit would be applied on the Source itself
       const [newModelPath, newModelName] = await createSqlModelFromTable(
+        instanceId,
         queryClient,
         connector as string,
         "",
@@ -82,6 +84,7 @@
   }
 
   $: createMetricsViewFromTable = useCreateMetricsViewFromTableUIAction(
+    runtimeClient,
     instanceId,
     connector as string,
     "",
@@ -93,6 +96,7 @@
   );
 
   $: createExploreFromTable = useCreateMetricsViewFromTableUIAction(
+    runtimeClient,
     instanceId,
     connector as string,
     "",
@@ -104,6 +108,7 @@
   );
 
   $: createCanvasDashboardFromTable = useCreateMetricsViewWithCanvasUIAction(
+    runtimeClient,
     instanceId,
     connector as string,
     "",
diff --git a/web-common/src/features/models/partitions/PartitionsTable.svelte b/web-common/src/features/models/partitions/PartitionsTable.svelte
index bcd8b2f7629..bb972f92245 100644
--- a/web-common/src/features/models/partitions/PartitionsTable.svelte
+++ b/web-common/src/features/models/partitions/PartitionsTable.svelte
@@ -16,7 +16,7 @@
     createRuntimeServiceGetModelPartitionsInfinite,
   } from "../../../runtime-client";
 
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import DataCell from "./DataCell.svelte";
   import ErrorCell from "./ErrorCell.svelte";
   import TriggerPartition from "./TriggerPartition.svelte";
@@ -25,8 +25,10 @@
   export let whereErrored: boolean;
   export let wherePending: boolean;
 
+  const runtimeClient = useRuntimeClient();
+
   $: modelName = resource?.meta?.name?.name as string;
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   // ==========================
   // Infinite Query
diff --git a/web-common/src/features/models/partitions/TriggerPartition.svelte b/web-common/src/features/models/partitions/TriggerPartition.svelte
index 8f9c448f63a..3e8250dee85 100644
--- a/web-common/src/features/models/partitions/TriggerPartition.svelte
+++ b/web-common/src/features/models/partitions/TriggerPartition.svelte
@@ -9,10 +9,11 @@
     getRuntimeServiceGetModelPartitionsQueryKey,
     type V1Resource,
   } from "../../../runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { addLeadingSlash } from "../../entity-management/entity-mappers";
   import { fileArtifacts } from "../../entity-management/file-artifacts";
 
+  const runtimeClient = useRuntimeClient();
   const queryClient = useQueryClient();
   const triggerMutation = createRuntimeServiceCreateTrigger();
 
@@ -75,7 +76,7 @@
     }, 2000);
   }
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
   $: isLoading = $triggerMutation.isPending;
 
   // If resource is passed as prop, use it directly; otherwise derive from URL params (web-local)
diff --git a/web-common/src/features/models/workspace/CreateDashboardButton.svelte b/web-common/src/features/models/workspace/CreateDashboardButton.svelte
index c90c8b967cf..98c1db583be 100644
--- a/web-common/src/features/models/workspace/CreateDashboardButton.svelte
+++ b/web-common/src/features/models/workspace/CreateDashboardButton.svelte
@@ -8,7 +8,7 @@
   import { MetricsEventSpace } from "@rilldata/web-common/metrics/service/MetricsTypes";
   import { Wand } from "lucide-svelte";
   import { V1ReconcileStatus } from "../../../runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { allowPrimary } from "../../dashboards/workspace/DeployProjectCTA.svelte";
   import { featureFlags } from "../../feature-flags";
   import { useCreateMetricsViewFromTableUIAction } from "../../metrics-views/ai-generation/generateMetricsView";
@@ -18,9 +18,10 @@
   export let hasResultTable = false;
   export let collapse = false;
 
+  const runtimeClient = useRuntimeClient();
   const { ai } = featureFlags;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: modelQuery = useModel(instanceId, modelName);
   $: connector = $modelQuery.data?.model?.spec?.outputConnector;
@@ -29,6 +30,7 @@
     V1ReconcileStatus.RECONCILE_STATUS_IDLE;
 
   $: createMetricsViewFromModel = useCreateMetricsViewFromTableUIAction(
+    runtimeClient,
     instanceId,
     connector as string,
     "",
diff --git a/web-common/src/features/models/workspace/ModelEditor.svelte b/web-common/src/features/models/workspace/ModelEditor.svelte
index b9707003863..7b2a53b2cb5 100644
--- a/web-common/src/features/models/workspace/ModelEditor.svelte
+++ b/web-common/src/features/models/workspace/ModelEditor.svelte
@@ -8,7 +8,7 @@
   import { EditorView } from "@codemirror/view";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { DuckDBSQL } from "../../../components/editor/presets/duckDBDialect";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import Editor from "../../editor/Editor.svelte";
   import { getExtensionsForFile } from "../../editor/getExtensionsForFile";
   import { FileArtifact } from "../../entity-management/file-artifact";
@@ -21,7 +21,9 @@
   export let fileArtifact: FileArtifact;
   export let onSave: (content: string) => void = () => {};
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   $: ({ remoteContent } = fileArtifact);
 
diff --git a/web-common/src/features/models/workspace/ModelWorkspaceCTAs.svelte b/web-common/src/features/models/workspace/ModelWorkspaceCTAs.svelte
index 4d0b83d53bb..7efe1e88837 100644
--- a/web-common/src/features/models/workspace/ModelWorkspaceCTAs.svelte
+++ b/web-common/src/features/models/workspace/ModelWorkspaceCTAs.svelte
@@ -10,7 +10,7 @@
     V1ReconcileStatus,
     type V1Resource,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { useGetMetricsViewsForModel } from "../../dashboards/selectors";
   import ExportMenu from "../../exports/ExportMenu.svelte";
   import { useCreateMetricsViewFromTableUIAction } from "../../metrics-views/ai-generation/generateMetricsView";
@@ -25,7 +25,9 @@
   export let hasUnsavedChanges: boolean;
   export let connector: string;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
   $: isModelIdle =
     resource?.meta?.reconcileStatus === V1ReconcileStatus.RECONCILE_STATUS_IDLE;
 
@@ -34,6 +36,7 @@
   $: availableMetricsViews = $metricsViewsQuery.data ?? [];
 
   $: createMetricsViewFromTable = useCreateMetricsViewFromTableUIAction(
+    runtimeClient,
     instanceId,
     connector,
     "",
diff --git a/web-common/src/features/onboarding/OnboardingWorkspace.svelte b/web-common/src/features/onboarding/OnboardingWorkspace.svelte
index 8dcbcd2bcd7..71db976646f 100644
--- a/web-common/src/features/onboarding/OnboardingWorkspace.svelte
+++ b/web-common/src/features/onboarding/OnboardingWorkspace.svelte
@@ -3,7 +3,7 @@
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
   import Button from "../../components/button/Button.svelte";
   import { createRuntimeServiceUnpackExample } from "../../runtime-client";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../runtime-client/v2";
   import { addSourceModal } from "../sources/modal/add-source-visibility";
   import ImportData from "@rilldata/web-common/components/icons/ImportData.svelte";
   import GenerateSampleData from "@rilldata/web-common/features/sample-data/GenerateSampleData.svelte";
@@ -21,7 +21,8 @@
   import { waitUntil } from "@rilldata/web-common/lib/waitUtils.ts";
   import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts.ts";
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+  $: ({ instanceId } = runtimeClient);
 
   const unpackExampleProject = createRuntimeServiceUnpackExample();
 
@@ -72,7 +73,8 @@
     <div class="flex flex-col w-64 gap-y-4">
       <GenerateSampleData type="home" />
       <Button
-        onClick={() => createResourceAndNavigate(ResourceKind.Model)}
+        onClick={() =>
+          createResourceAndNavigate(runtimeClient, ResourceKind.Model)}
         type="tertiary"
         large
         forcedStyle="height: 3rem;"
@@ -84,7 +86,8 @@
         Create blank model
       </Button>
       <Button
-        onClick={() => createResourceAndNavigate(ResourceKind.MetricsView)}
+        onClick={() =>
+          createResourceAndNavigate(runtimeClient, ResourceKind.MetricsView)}
         type="tertiary"
         large
         forcedStyle="height: 3rem;"
diff --git a/web-common/src/features/resource-graph/navigation/GraphContainer.svelte b/web-common/src/features/resource-graph/navigation/GraphContainer.svelte
index 5b1b34b8af2..1053f3a08c7 100644
--- a/web-common/src/features/resource-graph/navigation/GraphContainer.svelte
+++ b/web-common/src/features/resource-graph/navigation/GraphContainer.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
   import { createRuntimeServiceListResources } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+
+  const runtimeClient = useRuntimeClient();
   import ResourceGraph from "../embedding/ResourceGraph.svelte";
   export let seeds: string[] | undefined;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: resourcesQuery = createRuntimeServiceListResources(instanceId, undefined, {
     query: {
diff --git a/web-common/src/features/resource-graph/quick-view/QuickView.svelte b/web-common/src/features/resource-graph/quick-view/QuickView.svelte
index 6b7234f8abe..5083ce6238b 100644
--- a/web-common/src/features/resource-graph/quick-view/QuickView.svelte
+++ b/web-common/src/features/resource-graph/quick-view/QuickView.svelte
@@ -5,13 +5,15 @@
     closeResourceGraphQuickView,
     resourceGraphQuickViewState,
   } from "./quick-view-store";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { createRuntimeServiceListResources } from "@rilldata/web-common/runtime-client";
 
+  const runtimeClient = useRuntimeClient();
+
   $: currentState = $resourceGraphQuickViewState;
   $: anchorResource = currentState.anchorResource ?? undefined;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: shouldFetchResources = currentState.open && !!instanceId;
 
diff --git a/web-common/src/features/sample-data/GenerateSampleData.svelte b/web-common/src/features/sample-data/GenerateSampleData.svelte
index dc5bbebf204..71b067999c4 100644
--- a/web-common/src/features/sample-data/GenerateSampleData.svelte
+++ b/web-common/src/features/sample-data/GenerateSampleData.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { Button } from "@rilldata/web-common/components/button";
   import * as Dialog from "@rilldata/web-common/components/dialog";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { generateSampleData } from "@rilldata/web-common/features/sample-data/generate-sample-data.ts";
   import { SparklesIcon } from "lucide-svelte";
   import { defaults, superForm } from "sveltekit-superforms";
@@ -14,9 +14,10 @@
   export let type: "init" | "home" | "modal";
   export let open = false;
 
+  const runtimeClient = useRuntimeClient();
   const initializeProject = type === "init";
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
   const { developerChat } = featureFlags;
 
   const FORM_ID = "generate-sample-data-form";
@@ -36,7 +37,7 @@
     async onUpdate({ form }) {
       if (!form.valid) return;
       const values = form.data;
-      void generateSampleData(initializeProject, instanceId, values.prompt);
+      void generateSampleData(runtimeClient, initializeProject, values.prompt);
       open = false;
     },
     invalidateAll: false,
diff --git a/web-common/src/features/sample-data/generate-sample-data.ts b/web-common/src/features/sample-data/generate-sample-data.ts
index 3fa9685e24f..b503e250e5b 100644
--- a/web-common/src/features/sample-data/generate-sample-data.ts
+++ b/web-common/src/features/sample-data/generate-sample-data.ts
@@ -7,15 +7,19 @@ import { overlay } from "@rilldata/web-common/layout/overlay-store.ts";
 import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus.ts";
 import { sidebarActions } from "@rilldata/web-common/features/chat/layouts/sidebar/sidebar-store.ts";
 import { getConversationManager } from "@rilldata/web-common/features/chat/core/conversation-manager.ts";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
 export const generatingSampleData = writable(false);
 const PROJECT_INIT_TIMEOUT_MS = 10_000;
 
 export async function generateSampleData(
+  client: RuntimeClient,
   initializeProject: boolean,
-  instanceId: string,
   userPrompt: string,
 ) {
+  const instanceId = client.instanceId;
+  const agentPrompt = `Generate a new model with fresh data for the following user prompt: ${userPrompt}`;
+
   try {
     if (initializeProject) {
       overlay.set({
@@ -43,7 +47,7 @@ export async function generateSampleData(
     }
 
     generatingSampleData.set(true);
-    const conversationManager = getConversationManager(instanceId, {
+    const conversationManager = getConversationManager(client, {
       conversationState: "browserStorage",
       agent: ToolName.DEVELOPER_AGENT,
     });
diff --git a/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte b/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte
index ffa2612d7c1..4d6836db1a3 100644
--- a/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte
+++ b/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte
@@ -21,7 +21,7 @@
   import Input from "../../components/forms/Input.svelte";
   import Select from "../../components/forms/Select.svelte";
   import Checkbox from "../../components/forms/Checkbox.svelte";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let formId: string;
   export let data: Readable<ReportValues>;
@@ -45,13 +45,13 @@
       description: "Does NOT work for non-project members.",
     },
   ];
+  const runtimeClient = useRuntimeClient();
+
   $: selectedRunAsOption = RUN_AS_OPTIONS.find(
     (o) => o.value === $data["webOpenMode"],
   );
 
-  $: ({ instanceId } = $runtime);
-
-  $: hasSlackNotifier = getHasSlackConnection(instanceId);
+  $: hasSlackNotifier = getHasSlackConnection(runtimeClient.instanceId);
 </script>
 
 <form
@@ -126,14 +126,19 @@
 
     <div class="flex flex-col gap-y-3">
       <InputLabel label="Filters" id="filters" capitalize={false} />
-      <FiltersForm {instanceId} {filters} {timeControls} side="top" />
+      <FiltersForm
+        instanceId={runtimeClient.instanceId}
+        {filters}
+        {timeControls}
+        side="top"
+      />
     </div>
 
     <RowsAndColumnsForm
       bind:rows={$data["rows"]}
       bind:columns={$data["columns"]}
       columnErrors={$errors["columns"]}
-      {instanceId}
+      instanceId={runtimeClient.instanceId}
       {exploreName}
     />
 
diff --git a/web-common/src/features/scheduled-reports/ScheduleForm.svelte b/web-common/src/features/scheduled-reports/ScheduleForm.svelte
index 7932243cf7f..2195ed6fc34 100644
--- a/web-common/src/features/scheduled-reports/ScheduleForm.svelte
+++ b/web-common/src/features/scheduled-reports/ScheduleForm.svelte
@@ -7,16 +7,16 @@
     makeTimeZoneOptions,
     ReportFrequency,
   } from "@rilldata/web-common/features/scheduled-reports/time-utils.ts";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { Readable } from "svelte/store";
 
   export let data: Readable<ReturnType<typeof getInitialScheduleFormValues>>;
   export let exploreName: string;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
 
   // Pull the time zone options from the dashboard's spec
-  $: exploreSpec = useExploreValidSpec(instanceId, exploreName);
+  $: exploreSpec = useExploreValidSpec(runtimeClient.instanceId, exploreName);
   $: availableTimeZones = $exploreSpec.data?.explore?.timeZones;
   $: timeZoneOptions = makeTimeZoneOptions(availableTimeZones);
 </script>
diff --git a/web-common/src/features/scheduled-reports/ScheduledReportDialog.svelte b/web-common/src/features/scheduled-reports/ScheduledReportDialog.svelte
index 900db13ed59..2e247f9cca3 100644
--- a/web-common/src/features/scheduled-reports/ScheduledReportDialog.svelte
+++ b/web-common/src/features/scheduled-reports/ScheduledReportDialog.svelte
@@ -52,7 +52,7 @@
     type V1ReportSpec,
     type V1ReportSpecAnnotations,
   } from "../../runtime-client";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { getStateManagers } from "../dashboards/state-managers/state-managers";
   import { ResourceKind } from "../entity-management/resource-selectors";
   import BaseScheduledReportForm from "./BaseScheduledReportForm.svelte";
@@ -64,8 +64,10 @@
   const user = createAdminServiceGetCurrentUser();
   const FORM_ID = "scheduled-report-form";
 
+  const runtimeClient = useRuntimeClient();
+
   $: ({ organization, project, report: reportName } = $page.params);
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: listProjectMemberUsersQuery = createAdminServiceListProjectMemberUsers(
     organization,
diff --git a/web-common/src/features/sources/errors/ErrorPane.svelte b/web-common/src/features/sources/errors/ErrorPane.svelte
index 9554aaded03..6671e0ac1ee 100644
--- a/web-common/src/features/sources/errors/ErrorPane.svelte
+++ b/web-common/src/features/sources/errors/ErrorPane.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import CancelCircle from "../../../components/icons/CancelCircle.svelte";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { humanReadableErrorMessage } from "./errors";
   import { useSourceFromYaml } from "../selectors";
 
   export let filePath: string;
   export let errorMessage: string;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   // Parse Source YAML client-side
   $: sourceFromYaml = useSourceFromYaml(instanceId, filePath);
diff --git a/web-common/src/features/sources/modal/AddDataForm.svelte b/web-common/src/features/sources/modal/AddDataForm.svelte
index 729768b0c16..f3f166c7234 100644
--- a/web-common/src/features/sources/modal/AddDataForm.svelte
+++ b/web-common/src/features/sources/modal/AddDataForm.svelte
@@ -4,7 +4,7 @@
   import SubmissionError from "@rilldata/web-common/components/forms/SubmissionError.svelte";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { type V1ConnectorDriver } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { ActionResult } from "@sveltejs/kit";
   import type { SuperValidated } from "sveltekit-superforms";
 
@@ -37,6 +37,8 @@
   export let onClose: () => void;
   export let onCloseAfterNavigation: () => void = onClose;
 
+  const runtimeClient = useRuntimeClient();
+
   let saveAnyway = false;
   let showSaveAnyway = false;
 
@@ -108,7 +110,7 @@
   let existingEnvBlob: string | null = null;
   onMount(async () => {
     try {
-      const envFile = await runtimeServiceGetFile($runtime.instanceId, {
+      const envFile = await runtimeServiceGetFile(runtimeClient.instanceId, {
         path: ".env",
       });
       existingEnvBlob = envFile.blob ?? "";
@@ -222,6 +224,7 @@
 
     saveAnyway = true;
     const result = await formManager.saveConnectorAnyway({
+      instanceId: runtimeClient.instanceId,
       queryClient,
       values: $form,
     });
@@ -249,6 +252,7 @@
   $: saveAnywayLoading = submitting && saveAnyway;
 
   handleOnUpdate = formManager.makeOnUpdate({
+    instanceId: runtimeClient.instanceId,
     onClose,
     queryClient,
     getSelectedAuthMethod: () => activeAuthMethod || undefined,
diff --git a/web-common/src/features/sources/modal/AddDataFormManager.ts b/web-common/src/features/sources/modal/AddDataFormManager.ts
index 8fe36d87ec4..8cd151c6418 100644
--- a/web-common/src/features/sources/modal/AddDataFormManager.ts
+++ b/web-common/src/features/sources/modal/AddDataFormManager.ts
@@ -246,6 +246,7 @@ export class AddDataFormManager {
 
   makeOnUpdate(args: {
     onClose: () => void;
+    instanceId: string;
     queryClient: QueryClient;
     getSelectedAuthMethod?: () => string | undefined;
     setParamsError: (message: string | null, details?: string) => void;
@@ -253,6 +254,7 @@ export class AddDataFormManager {
   }) {
     const {
       onClose,
+      instanceId,
       queryClient,
       getSelectedAuthMethod,
       setParamsError,
@@ -349,6 +351,7 @@ export class AddDataFormManager {
         if (isStepFlowConnector && isOnSourceOrExplorerStep) {
           // Step 2: submit the source/model and close
           await submitAddSourceForm(
+            instanceId,
             queryClient,
             connector,
             submitValues,
@@ -358,6 +361,7 @@ export class AddDataFormManager {
         } else if (isStepFlowConnector && isOnConnectorStep) {
           // Step 1: test connector, persist config, then advance to step 2
           await this.submitConnectorStepAndAdvance({
+            instanceId,
             queryClient,
             values,
             submitValues,
@@ -366,11 +370,17 @@ export class AddDataFormManager {
           });
         } else if (this.formType === "source") {
           // Single-step source form
-          await submitAddSourceForm(queryClient, connector, submitValues);
+          await submitAddSourceForm(
+            instanceId,
+            queryClient,
+            connector,
+            submitValues,
+          );
           onClose();
         } else {
           // Single-step connector form
           await submitAddConnectorForm(
+            instanceId,
             queryClient,
             connector,
             submitValues,
@@ -390,14 +400,21 @@ export class AddDataFormManager {
    * persist connector config, then advance to the source/explorer step.
    */
   private async submitConnectorStepAndAdvance(args: {
+    instanceId: string;
     queryClient: QueryClient;
     values: FormData;
     submitValues: FormData;
     isPublicAuth: boolean;
     isMultiStep: boolean;
   }) {
-    const { queryClient, values, submitValues, isPublicAuth, isMultiStep } =
-      args;
+    const {
+      instanceId,
+      queryClient,
+      values,
+      submitValues,
+      isPublicAuth,
+      isMultiStep,
+    } = args;
     const nextStep = isMultiStep ? "source" : "explorer";
 
     if (isPublicAuth) {
@@ -411,6 +428,7 @@ export class AddDataFormManager {
 
     // Test the connection, then persist config and advance
     const connectorInstanceName = await submitAddConnectorForm(
+      instanceId,
       queryClient,
       this.connector,
       submitValues,
@@ -616,16 +634,18 @@ export class AddDataFormManager {
    * Schema conditionals handle connector-specific requirements (e.g., SSL).
    */
   async saveConnectorAnyway(args: {
+    instanceId: string;
     queryClient: QueryClient;
     values: FormData;
   }): Promise<{ ok: true } | { ok: false; message: string; details?: string }> {
-    const { queryClient, values } = args;
+    const { instanceId, queryClient, values } = args;
     const schema = getConnectorSchema(this.schemaName);
     const processedValues = schema
       ? filterSchemaValuesForSubmit(schema, values, { step: "connector" })
       : values;
     try {
       await submitAddConnectorForm(
+        instanceId,
         queryClient,
         this.connector,
         processedValues,
diff --git a/web-common/src/features/sources/modal/AddDataModal.svelte b/web-common/src/features/sources/modal/AddDataModal.svelte
index 0a2d42e71f5..a22304e8b3f 100644
--- a/web-common/src/features/sources/modal/AddDataModal.svelte
+++ b/web-common/src/features/sources/modal/AddDataModal.svelte
@@ -10,7 +10,7 @@
     BehaviourEventMedium,
   } from "../../../metrics/service/BehaviourEventTypes";
   import { MetricsEventSpace } from "../../../metrics/service/MetricsTypes";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { connectorIconMapping } from "../../connectors/connector-icon-mapping";
   import { useIsModelingSupportedForDefaultOlapDriverOLAP as useIsModelingSupportedForDefaultOlapDriver } from "../../connectors/selectors";
   import { duplicateSourceName } from "../sources-store";
@@ -148,8 +148,10 @@
     resetModal();
   }
 
+  const runtimeClient = useRuntimeClient();
+
   $: isModelingSupportedForDefaultOlapDriver =
-    useIsModelingSupportedForDefaultOlapDriver($runtime.instanceId);
+    useIsModelingSupportedForDefaultOlapDriver(runtimeClient.instanceId);
   $: isModelingSupported = $isModelingSupportedForDefaultOlapDriver.data;
 
   // FIXME: excluding salesforce until we implement the table discovery APIs
diff --git a/web-common/src/features/sources/modal/FileDrop.svelte b/web-common/src/features/sources/modal/FileDrop.svelte
index 47fa6e7ce1d..a60b387575e 100644
--- a/web-common/src/features/sources/modal/FileDrop.svelte
+++ b/web-common/src/features/sources/modal/FileDrop.svelte
@@ -4,7 +4,7 @@
   import { getFilePathFromNameAndType } from "@rilldata/web-common/features/entity-management/entity-mappers";
   import { EntityType } from "@rilldata/web-common/features/entity-management/types";
   import { createRuntimeServiceUnpackEmpty } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { EMPTY_PROJECT_TITLE } from "../../welcome/constants";
   import { isProjectInitialized } from "../../welcome/is-project-initialized";
   import { compileLocalFileSourceYAML } from "../sourceUtils";
@@ -13,7 +13,9 @@
 
   export let showDropOverlay: boolean;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   const unpackEmptyProject = createRuntimeServiceUnpackEmpty();
 
diff --git a/web-common/src/features/sources/modal/LocalSourceUpload.svelte b/web-common/src/features/sources/modal/LocalSourceUpload.svelte
index 6a377e7f5e9..1a2d4d45270 100644
--- a/web-common/src/features/sources/modal/LocalSourceUpload.svelte
+++ b/web-common/src/features/sources/modal/LocalSourceUpload.svelte
@@ -9,7 +9,7 @@
   } from "@rilldata/web-common/features/sources/modal/file-upload";
   import { overlay } from "@rilldata/web-common/layout/overlay-store";
   import { createRuntimeServiceUnpackEmpty } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { EMPTY_PROJECT_TITLE } from "../../welcome/constants";
   import { isProjectInitialized } from "../../welcome/is-project-initialized";
   import { compileLocalFileSourceYAML } from "../sourceUtils";
@@ -18,7 +18,9 @@
   export let onClose: () => void = () => {};
   export let onBack: () => void = () => {};
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
+  $: ({ instanceId } = runtimeClient);
 
   const unpackEmptyProject = createRuntimeServiceUnpackEmpty();
 
diff --git a/web-common/src/features/sources/modal/SourceImportedModal.svelte b/web-common/src/features/sources/modal/SourceImportedModal.svelte
index c62cf4e9ebb..5757c385b05 100644
--- a/web-common/src/features/sources/modal/SourceImportedModal.svelte
+++ b/web-common/src/features/sources/modal/SourceImportedModal.svelte
@@ -6,7 +6,7 @@
   import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts";
   import { sourceIngestionTracker } from "@rilldata/web-common/features/sources/sources-store";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { CreateQueryResult } from "@tanstack/svelte-query";
   import { WandIcon } from "lucide-svelte";
   import { BehaviourEventMedium } from "../../../metrics/service/BehaviourEventTypes";
@@ -24,12 +24,14 @@
 
   export let sourcePath: string | null;
 
+  const runtimeClient = useRuntimeClient();
+
   let fileArtifact: FileArtifact;
   let sourceQuery: CreateQueryResult<V1Resource, HTTPError>;
 
   $: sourceName = extractFileName(sourcePath ?? "");
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: if (sourcePath) {
     fileArtifact = fileArtifacts.getFileArtifact(sourcePath);
@@ -43,6 +45,7 @@
     sourcePath !== null
       ? $generateCanvas
         ? useCreateMetricsViewWithCanvasAndExploreUIAction(
+            runtimeClient,
             instanceId,
             sinkConnector as string,
             "",
@@ -52,6 +55,7 @@
             MetricsEventSpace.Modal,
           )
         : useCreateMetricsViewFromTableUIAction(
+            runtimeClient,
             instanceId,
             sinkConnector as string,
             "",
diff --git a/web-common/src/features/sources/modal/submitAddDataForm.ts b/web-common/src/features/sources/modal/submitAddDataForm.ts
index f1585be5547..d80af00cf74 100644
--- a/web-common/src/features/sources/modal/submitAddDataForm.ts
+++ b/web-common/src/features/sources/modal/submitAddDataForm.ts
@@ -1,7 +1,6 @@
 import { goto, invalidate } from "$app/navigation";
 import { getScreenNameFromPage } from "@rilldata/web-common/features/file-explorer/telemetry";
 import type { QueryClient } from "@tanstack/query-core";
-import { get } from "svelte/store";
 import { behaviourEvent } from "../../../metrics/initMetrics";
 import {
   BehaviourEventAction,
@@ -14,7 +13,6 @@ import {
   runtimeServicePutFile,
   runtimeServiceUnpackEmpty,
 } from "../../../runtime-client";
-import { runtime } from "../../../runtime-client/runtime-store";
 import {
   compileConnectorYAML,
   updateDotEnvWithSecrets,
@@ -127,7 +125,11 @@ async function setOlapConnectorInRillYAML(
 ): Promise<void> {
   await runtimeServicePutFile(instanceId, {
     path: "rill.yaml",
-    blob: await updateRillYAMLWithOlapConnector(queryClient, newConnectorName),
+    blob: await updateRillYAMLWithOlapConnector(
+      instanceId,
+      queryClient,
+      newConnectorName,
+    ),
     create: true,
     createOnly: false,
   });
@@ -138,9 +140,9 @@ async function saveConnectorAnyway(
   connector: V1ConnectorDriver,
   formValues: AddDataFormValues,
   newConnectorName: string,
-  instanceId?: string,
+  instanceId: string,
 ): Promise<void> {
-  const resolvedInstanceId = instanceId ?? get(runtime).instanceId;
+  const resolvedInstanceId = instanceId;
   const schema = getConnectorSchema(connector.name ?? "");
   const schemaFields = schema
     ? getSchemaFieldMetaList(schema, { step: "connector" })
@@ -163,10 +165,16 @@ async function saveConnectorAnyway(
 
   // Update .env file with secrets (keep ordering consistent with Test and Connect)
   const { newBlob: newEnvBlob, originalBlob: envBlobForYaml } =
-    await updateDotEnvWithSecrets(queryClient, connector, formValues, {
-      secretKeys: schemaSecretKeys,
-      schema: schema ?? undefined,
-    });
+    await updateDotEnvWithSecrets(
+      resolvedInstanceId,
+      queryClient,
+      connector,
+      formValues,
+      {
+        secretKeys: schemaSecretKeys,
+        schema: schema ?? undefined,
+      },
+    );
 
   await runtimeServicePutFile(resolvedInstanceId, {
     path: ".env",
@@ -206,12 +214,12 @@ async function saveConnectorAnyway(
 }
 
 export async function submitAddConnectorForm(
+  instanceId: string,
   queryClient: QueryClient,
   connector: V1ConnectorDriver,
   formValues: AddDataFormValues,
   saveAnyway: boolean = false,
 ): Promise<string> {
-  const instanceId = get(runtime).instanceId;
   await beforeSubmitForm(instanceId, connector);
   const schema = getConnectorSchema(connector.name ?? "");
   const schemaFields = schema
@@ -288,6 +296,7 @@ export async function submitAddConnectorForm(
       // Capture original .env and compute updated contents up front
       // Use originalBlob from updateDotEnvWithSecrets for consistent conflict detection
       const envResult = await updateDotEnvWithSecrets(
+        instanceId,
         queryClient,
         connector,
         formValues,
@@ -424,12 +433,12 @@ export async function submitAddConnectorForm(
 }
 
 export async function submitAddSourceForm(
+  instanceId: string,
   queryClient: QueryClient,
   connector: V1ConnectorDriver,
   formValues: AddDataFormValues,
   connectorInstanceName?: string,
 ): Promise<void> {
-  const instanceId = get(runtime).instanceId;
   await beforeSubmitForm(instanceId, connector);
   const newSourceName = formValues.name as string;
 
@@ -476,6 +485,7 @@ export async function submitAddSourceForm(
   // Create or update the `.env` file
   const { newBlob: newEnvBlob, originalBlob: originalEnvBlob } =
     await updateDotEnvWithSecrets(
+      instanceId,
       queryClient,
       rewrittenConnector,
       rewrittenFormValues,
diff --git a/web-common/src/features/sources/navigation/SourceMenuItems.svelte b/web-common/src/features/sources/navigation/SourceMenuItems.svelte
index 3742eb66f4f..a0c192635d2 100644
--- a/web-common/src/features/sources/navigation/SourceMenuItems.svelte
+++ b/web-common/src/features/sources/navigation/SourceMenuItems.svelte
@@ -26,7 +26,7 @@
   import { useQueryClient } from "@tanstack/svelte-query";
   import { GitBranch, WandIcon } from "lucide-svelte";
   import MetricsViewIcon from "../../../components/icons/MetricsViewIcon.svelte";
-  import { runtime } from "../../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "../../../runtime-client/v2";
   import { createSqlModelFromTable } from "../../connectors/code-utils";
   import {
     useCreateMetricsViewFromTableUIAction,
@@ -39,11 +39,13 @@
 
   export let filePath: string;
 
+  const runtimeClient = useRuntimeClient();
+
   $: fileArtifact = fileArtifacts.getFileArtifact(filePath);
 
   const queryClient = useQueryClient();
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   const { ai, generateCanvas } = featureFlags;
 
@@ -76,6 +78,7 @@
   $: sourceFromYaml = useSourceFromYaml(instanceId, filePath);
 
   $: createMetricsViewFromTable = useCreateMetricsViewFromTableUIAction(
+    runtimeClient,
     instanceId,
     sinkConnector as string,
     database,
@@ -87,6 +90,7 @@
   );
 
   $: createExploreFromTable = useCreateMetricsViewFromTableUIAction(
+    runtimeClient,
     instanceId,
     sinkConnector as string,
     database,
@@ -98,6 +102,7 @@
   );
 
   $: createCanvasDashboardFromTable = useCreateMetricsViewWithCanvasUIAction(
+    runtimeClient,
     instanceId,
     sinkConnector as string,
     database,
@@ -112,6 +117,7 @@
       const previousActiveEntity = getScreenNameFromPage();
       const addDevLimit = false; // Typically, the `dev` limit would be applied on the Source itself
       const [newModelPath, newModelName] = await createSqlModelFromTable(
+        instanceId,
         queryClient,
         connector,
         database,
diff --git a/web-common/src/features/visual-editing/ThemeInput.svelte b/web-common/src/features/visual-editing/ThemeInput.svelte
index 813cbee0a21..8147f3f08fc 100644
--- a/web-common/src/features/visual-editing/ThemeInput.svelte
+++ b/web-common/src/features/visual-editing/ThemeInput.svelte
@@ -4,7 +4,7 @@
   import InputLabel from "@rilldata/web-common/components/forms/InputLabel.svelte";
   import Select from "@rilldata/web-common/components/forms/Select.svelte";
   import type { V1ThemeSpec } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import {
     defaultPrimaryColors,
     defaultSecondaryColors,
@@ -12,6 +12,8 @@
   import { useTheme } from "../themes/selectors";
   import { themeControl } from "../themes/theme-control";
 
+  const runtimeClient = useRuntimeClient();
+
   const DEFAULT_PRIMARY = `hsl(${defaultPrimaryColors[500].split(" ").join(",")})`;
   const DEFAULT_SECONDARY = `hsl(${defaultSecondaryColors[500].split(" ").join(",")})`;
   const FALLBACK_PRIMARY = "hsl(180, 100%, 50%)";
@@ -30,7 +32,7 @@
 
   let lastPresetTheme: string | undefined = undefined;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: isPresetMode = theme === undefined || typeof theme === "string";
   $: embeddedTheme = typeof theme === "object" ? theme : undefined;
diff --git a/web-common/src/features/welcome/ProjectCards.svelte b/web-common/src/features/welcome/ProjectCards.svelte
index ea8cbb98654..7fbda540fe9 100644
--- a/web-common/src/features/welcome/ProjectCards.svelte
+++ b/web-common/src/features/welcome/ProjectCards.svelte
@@ -14,7 +14,9 @@
     createRuntimeServiceUnpackEmpty,
     createRuntimeServiceUnpackExample,
   } from "../../runtime-client";
-  import { runtime } from "../../runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+
+  const runtimeClient = useRuntimeClient();
   import { EMPTY_PROJECT_TITLE } from "./constants";
   import { EXAMPLES } from "./constants";
   import {
@@ -27,7 +29,7 @@
 
   let selectedProjectName: string | null = null;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: ({ mutateAsync: unpackExample } = $unpackExampleProject);
   $: ({ mutateAsync: unpackEmpty } = $unpackEmptyProject);
diff --git a/web-common/src/features/workspaces/CanvasWorkspace.svelte b/web-common/src/features/workspaces/CanvasWorkspace.svelte
index 9675055bd07..4b96a042637 100644
--- a/web-common/src/features/workspaces/CanvasWorkspace.svelte
+++ b/web-common/src/features/workspaces/CanvasWorkspace.svelte
@@ -17,7 +17,7 @@
   import { workspaces } from "@rilldata/web-common/layout/workspace/workspace-stores";
   import WorkspaceEditorContainer from "@rilldata/web-common/layout/workspace/WorkspaceEditorContainer.svelte";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import PreviewButton from "../explores/PreviewButton.svelte";
   import CanvasBuilder from "../canvas/CanvasBuilder.svelte";
   import SaveDefaultsButton from "../canvas/components/SaveDefaultsButton.svelte";
@@ -26,11 +26,11 @@
 
   export let fileArtifact: FileArtifact;
 
+  const runtimeClient = useRuntimeClient();
+
   let canvasName: string;
   let selectedView: "split" | "code" | "viz";
 
-  $: ({ instanceId } = $runtime);
-
   $: ({
     autoSave,
     path: filePath,
@@ -41,7 +41,7 @@
     saveState: { saving },
   } = fileArtifact);
 
-  $: resourceQuery = getResource(queryClient, instanceId);
+  $: resourceQuery = getResource(queryClient, runtimeClient.instanceId);
 
   $: ({ data } = $resourceQuery);
 
@@ -54,13 +54,16 @@
   $: canvasName = getNameFromFile(filePath);
 
   // Parse error for the editor gutter and banner
-  $: parseErrorQuery = fileArtifact.getParseError(queryClient, instanceId);
+  $: parseErrorQuery = fileArtifact.getParseError(
+    queryClient,
+    runtimeClient.instanceId,
+  );
   $: parseError = $parseErrorQuery;
 
   // Reconcile error resolved to root cause for the banner
   $: reconcileError = data?.meta?.reconcileError;
   $: rootCauseQuery = createRootCauseErrorQuery(
-    instanceId,
+    runtimeClient.instanceId,
     data,
     reconcileError,
   );
@@ -70,7 +73,7 @@
 
   async function onChangeCallback(newTitle: string) {
     const newRoute = await handleEntityRename(
-      $runtime.instanceId,
+      runtimeClient.instanceId,
       newTitle,
       filePath,
       fileName,
@@ -82,7 +85,7 @@
 {#key canvasName}
   <CanvasInitialization
     {canvasName}
-    {instanceId}
+    instanceId={runtimeClient.instanceId}
     let:ready
     let:isReconciling
     let:isLoading
@@ -100,7 +103,11 @@
       >
         <div class="flex gap-x-2" slot="cta">
           {#if ready}
-            <SaveDefaultsButton {canvasName} {instanceId} saving={$saving} />
+            <SaveDefaultsButton
+              {canvasName}
+              instanceId={runtimeClient.instanceId}
+              saving={$saving}
+            />
           {/if}
 
           <PreviewButton
diff --git a/web-common/src/features/workspaces/ExploreWorkspace.svelte b/web-common/src/features/workspaces/ExploreWorkspace.svelte
index bedece4347a..1069fa1b027 100644
--- a/web-common/src/features/workspaces/ExploreWorkspace.svelte
+++ b/web-common/src/features/workspaces/ExploreWorkspace.svelte
@@ -16,7 +16,7 @@
   import WorkspaceHeader from "@rilldata/web-common/layout/workspace/WorkspaceHeader.svelte";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { createRuntimeServiceGetExplore } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import Spinner from "../entity-management/Spinner.svelte";
   import PreviewButton from "../explores/PreviewButton.svelte";
   import VisualExploreEditing from "./VisualExploreEditing.svelte";
@@ -26,7 +26,8 @@
 
   export let fileArtifact: FileArtifact;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
   $: ({
     hasUnsavedChanges,
     autoSave,
@@ -38,7 +39,9 @@
 
   $: exploreName = $resourceName?.name ?? getNameFromFile(filePath);
 
-  $: query = createRuntimeServiceGetExplore(instanceId, { name: exploreName });
+  $: query = createRuntimeServiceGetExplore(runtimeClient.instanceId, {
+    name: exploreName,
+  });
 
   $: ({ data: resources } = $query);
 
@@ -55,14 +58,17 @@
   $: metricsViewName = metricsViewResource?.meta?.name?.name;
 
   // Parse error for the editor gutter and banner
-  $: parseErrorQuery = fileArtifact.getParseError(queryClient, instanceId);
+  $: parseErrorQuery = fileArtifact.getParseError(
+    queryClient,
+    runtimeClient.instanceId,
+  );
   $: parseError = $parseErrorQuery;
 
   // Reconcile error resolved to root cause for the banner
   $: reconcileError = (exploreResource ?? metricsViewResource)?.meta
     ?.reconcileError;
   $: rootCauseQuery = createRootCauseErrorQuery(
-    instanceId,
+    runtimeClient.instanceId,
     exploreResource ?? metricsViewResource,
     reconcileError,
   );
@@ -72,7 +78,7 @@
 
   async function onChangeCallback(newTitle: string) {
     const newRoute = await handleEntityRename(
-      instanceId,
+      runtimeClient.instanceId,
       newTitle,
       filePath,
       fileName,
diff --git a/web-common/src/features/workspaces/MetricsWorkspace.svelte b/web-common/src/features/workspaces/MetricsWorkspace.svelte
index f351b736cbd..8cbb940ab06 100644
--- a/web-common/src/features/workspaces/MetricsWorkspace.svelte
+++ b/web-common/src/features/workspaces/MetricsWorkspace.svelte
@@ -11,7 +11,7 @@
   import WorkspaceHeader from "@rilldata/web-common/layout/workspace/WorkspaceHeader.svelte";
   import { workspaces } from "@rilldata/web-common/layout/workspace/workspace-stores";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import {
     useIsModelingSupportedForConnectorOLAP as useIsModelingSupportedForConnector,
     useIsModelingSupportedForDefaultOlapDriverOLAP as useIsModelingSupportedForDefaultOlapDriver,
@@ -22,7 +22,8 @@
 
   export let fileArtifact: FileArtifact;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
+
   $: ({
     hasUnsavedChanges,
     autoSave,
@@ -36,7 +37,10 @@
 
   $: metricsViewName = $resourceName?.name ?? getNameFromFile(filePath);
 
-  $: resourceQuery = fileArtifact.getResource(queryClient, instanceId);
+  $: resourceQuery = fileArtifact.getResource(
+    queryClient,
+    runtimeClient.instanceId,
+  );
   $: ({ data: resource } = $resourceQuery);
 
   $: isOldMetricsView = !$remoteContent?.includes("version: 1");
@@ -47,9 +51,9 @@
   $: table = resource?.metricsView?.state?.validSpec?.table ?? "";
 
   $: isModelingSupportedForDefaultOlapDriver =
-    useIsModelingSupportedForDefaultOlapDriver(instanceId);
+    useIsModelingSupportedForDefaultOlapDriver(runtimeClient.instanceId);
   $: isModelingSupportedForConnector = useIsModelingSupportedForConnector(
-    instanceId,
+    runtimeClient.instanceId,
     connector,
   );
   $: isModelingSupported = connector
@@ -59,13 +63,16 @@
   $: selectedView = workspace.view;
 
   // Parse error for the editor gutter and banner
-  $: parseErrorQuery = fileArtifact.getParseError(queryClient, instanceId);
+  $: parseErrorQuery = fileArtifact.getParseError(
+    queryClient,
+    runtimeClient.instanceId,
+  );
   $: parseError = $parseErrorQuery;
 
   // Reconcile error resolved to root cause for the banner
   $: reconcileError = resource?.meta?.reconcileError;
   $: rootCauseQuery = createRootCauseErrorQuery(
-    instanceId,
+    runtimeClient.instanceId,
     resource,
     reconcileError,
   );
@@ -75,7 +82,7 @@
 
   async function onChangeCallback(newTitle: string) {
     const newRoute = await handleEntityRename(
-      instanceId,
+      runtimeClient.instanceId,
       newTitle,
       filePath,
       fileName,
diff --git a/web-common/src/features/workspaces/ModelWorkspace.svelte b/web-common/src/features/workspaces/ModelWorkspace.svelte
index 6d7b0129eaa..a296269e706 100644
--- a/web-common/src/features/workspaces/ModelWorkspace.svelte
+++ b/web-common/src/features/workspaces/ModelWorkspace.svelte
@@ -20,13 +20,15 @@
   import type { V1Model } from "@rilldata/web-common/runtime-client";
   import { httpRequestQueue } from "@rilldata/web-common/runtime-client/http-client";
   import { isProfilingQuery } from "@rilldata/web-common/runtime-client/query-matcher";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { fade, slide } from "svelte/transition";
   import ReconcilingSpinner from "../entity-management/ReconcilingSpinner.svelte";
   import { getUserFriendlyError } from "../models/error-utils";
 
   export let fileArtifact: FileArtifact;
 
+  const runtimeClient = useRuntimeClient();
+
   $: ({
     hasUnsavedChanges,
     autoSave,
@@ -40,14 +42,21 @@
   $: workspace = workspaces.get(filePath);
   $: tableVisible = workspace.table.visible;
 
-  $: ({ instanceId } = $runtime);
-
-  $: allErrorsStore = fileArtifact.getAllErrors(queryClient, instanceId);
-  $: hasErrors = fileArtifact.getHasErrors(queryClient, instanceId);
+  $: allErrorsStore = fileArtifact.getAllErrors(
+    queryClient,
+    runtimeClient.instanceId,
+  );
+  $: hasErrors = fileArtifact.getHasErrors(
+    queryClient,
+    runtimeClient.instanceId,
+  );
 
   $: allErrors = $allErrorsStore;
 
-  $: resourceQuery = fileArtifact.getResource(queryClient, instanceId);
+  $: resourceQuery = fileArtifact.getResource(
+    queryClient,
+    runtimeClient.instanceId,
+  );
   $: resource = $resourceQuery.data;
   $: model = $resourceQuery.data?.model;
   $: connector = (model as V1Model)?.spec?.outputConnector as string;
@@ -70,7 +79,7 @@
 
   async function handleNameChange(newTitle: string) {
     const newRoute = await handleEntityRename(
-      instanceId,
+      runtimeClient.instanceId,
       newTitle,
       filePath,
       fileName,
diff --git a/web-common/src/features/workspaces/VisualExploreEditing.svelte b/web-common/src/features/workspaces/VisualExploreEditing.svelte
index a0240c8a3bc..4a3b35a2ed8 100644
--- a/web-common/src/features/workspaces/VisualExploreEditing.svelte
+++ b/web-common/src/features/workspaces/VisualExploreEditing.svelte
@@ -23,7 +23,7 @@
     createRuntimeServiceGetInstance,
     type V1Explore,
   } from "@rilldata/web-common/runtime-client";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { InfoIcon } from "lucide-svelte";
   import { Scalar, YAMLMap, YAMLSeq, parseDocument } from "yaml";
   import { getStateManagers } from "../dashboards/state-managers/state-managers";
@@ -50,6 +50,7 @@
   export let autoSave: boolean;
   export let switchView: () => void;
 
+  const runtimeClient = useRuntimeClient();
   const StateManagers = getStateManagers();
   const timeControlsStore = useTimeControlStore(StateManagers);
 
@@ -65,7 +66,6 @@
 
   $: ({ selectedTimeRange, showTimeComparison } = $timeControlsStore);
 
-  $: ({ instanceId } = $runtime);
   $: ({ editorContent, path, updateEditorContent } = fileArtifact);
 
   $: exploreSpec = exploreResource?.state?.validSpec;
@@ -73,7 +73,7 @@
   $: parsedDocument = parseDocument($editorContent ?? "");
 
   $: metricsViewsQuery = useFilteredResources(
-    instanceId,
+    runtimeClient.instanceId,
     ResourceKind.MetricsView,
   );
 
@@ -162,14 +162,17 @@
   $: dimensionExpression =
     rawDimensions instanceof YAMLMap ? rawDimensions?.get("expr") : "";
 
-  $: themesQuery = useFilteredResources(instanceId, ResourceKind.Theme);
+  $: themesQuery = useFilteredResources(
+    runtimeClient.instanceId,
+    ResourceKind.Theme,
+  );
 
   $: themeNames = ($themesQuery?.data ?? [])
     .map((theme) => theme.meta?.name?.name ?? "")
     .filter((string) => !string.endsWith("--theme"));
 
   $: defaultThemeQuery = createRuntimeServiceGetInstance(
-    instanceId,
+    runtimeClient.instanceId,
     undefined,
     {
       query: {
diff --git a/web-common/src/features/workspaces/VisualMetrics.svelte b/web-common/src/features/workspaces/VisualMetrics.svelte
index 40f88e83e7f..7fe159e3bcc 100644
--- a/web-common/src/features/workspaces/VisualMetrics.svelte
+++ b/web-common/src/features/workspaces/VisualMetrics.svelte
@@ -25,7 +25,7 @@
     type MetricsViewSpecDimension,
     type V1Resource,
   } from "@rilldata/web-common/runtime-client/gen/index.schemas";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { PlusIcon } from "lucide-svelte";
   import { tick } from "svelte";
   import { slide } from "svelte/transition";
@@ -90,9 +90,9 @@
   };
   let storedProperties: Record<string, unknown> = {};
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
 
-  $: instance = createRuntimeServiceGetInstance(instanceId, {
+  $: instance = createRuntimeServiceGetInstance(runtimeClient.instanceId, {
     sensitive: true,
   });
 
@@ -111,7 +111,10 @@
   };
 
   $: isModelingSupportedForConnector = olapConnector
-    ? useIsModelingSupportedForConnector(instanceId, olapConnector)
+    ? useIsModelingSupportedForConnector(
+        runtimeClient.instanceId,
+        olapConnector,
+      )
     : null;
   $: isModelingSupported = $isModelingSupportedForConnector?.data;
 
@@ -132,9 +135,9 @@
 
   $: noTableProperties = !yamlConnector && !database && !databaseSchema;
 
-  $: modelsQuery = useModels(instanceId);
-  $: sourcesQuery = useSources(instanceId);
-  $: metricsViewQuery = getResource(queryClient, instanceId);
+  $: modelsQuery = useModels(runtimeClient.instanceId);
+  $: sourcesQuery = useSources(runtimeClient.instanceId);
+  $: metricsViewQuery = getResource(queryClient, runtimeClient.instanceId);
 
   $: modelNames = $modelsQuery?.data?.map(resourceToOption) ?? [];
   $: sourceNames = $sourcesQuery?.data?.map(resourceToOption) ?? [];
@@ -151,7 +154,7 @@
   $: hasValidModelOrSourceSelection = hasSourceSelected || hasModelSelected;
 
   $: hasNonDuckDBOLAPConnectorQuery = createRuntimeServiceAnalyzeConnectors(
-    instanceId,
+    runtimeClient.instanceId,
     {
       query: {
         select: (data) => {
@@ -182,7 +185,11 @@
 
   $: resourceQuery =
     resourceKind &&
-    useResource(instanceId, modelOrSourceOrTableName, resourceKind);
+    useResource(
+      runtimeClient.instanceId,
+      modelOrSourceOrTableName,
+      resourceKind,
+    );
 
   $: connector =
     yamlConnector ||
@@ -192,7 +199,7 @@
     olapConnector;
 
   $: columnsQuery = createQueryServiceTableColumns(
-    instanceId,
+    runtimeClient.instanceId,
     modelOrSourceOrTableName,
     {
       connector,
@@ -272,12 +279,15 @@
 
   $: tablesQuery = createConnectorServiceOLAPListTables(
     {
-      instanceId,
+      instanceId: runtimeClient.instanceId,
       connector,
     },
     {
       query: {
-        enabled: !!instanceId && !!connector && !hasValidModelOrSourceSelection,
+        enabled:
+          !!runtimeClient.instanceId &&
+          !!connector &&
+          !hasValidModelOrSourceSelection,
       },
     },
   );
diff --git a/web-common/src/features/workspaces/WorkspaceBreadcrumbs.svelte b/web-common/src/features/workspaces/WorkspaceBreadcrumbs.svelte
index 7c74b82d624..b1ed673e9af 100644
--- a/web-common/src/features/workspaces/WorkspaceBreadcrumbs.svelte
+++ b/web-common/src/features/workspaces/WorkspaceBreadcrumbs.svelte
@@ -4,7 +4,7 @@
     type V1Resource,
   } from "@rilldata/web-common/runtime-client";
   import { ResourceKind } from "../entity-management/resource-selectors";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import WorkspaceCrumb from "./WorkspaceCrumb.svelte";
   import ResourceGraphOverlay from "@rilldata/web-common/features/resource-graph/embedding/ResourceGraphOverlay.svelte";
   import { ALLOWED_FOR_GRAPH } from "@rilldata/web-common/features/resource-graph/navigation/seed-parser";
@@ -12,14 +12,18 @@
   export let resource: V1Resource | undefined;
   export let filePath: string;
 
-  $: ({ instanceId } = $runtime);
+  const runtimeClient = useRuntimeClient();
 
   $: resourceKind = resource?.meta?.name?.kind as ResourceKind | undefined;
   $: resourceName = resource?.meta?.name?.name;
 
-  $: resourcesQuery = createRuntimeServiceListResources(instanceId, undefined, {
-    query: { retry: 2, refetchOnMount: true },
-  });
+  $: resourcesQuery = createRuntimeServiceListResources(
+    runtimeClient.instanceId,
+    undefined,
+    {
+      query: { retry: 2, refetchOnMount: true },
+    },
+  );
   $: allResources = $resourcesQuery.data?.resources ?? [];
   $: resourcesLoading = $resourcesQuery.isLoading;
   $: resourcesError = $resourcesQuery.error
diff --git a/web-common/src/layout/ApplicationHeader.svelte b/web-common/src/layout/ApplicationHeader.svelte
index 492361ecc16..3251189cbee 100644
--- a/web-common/src/layout/ApplicationHeader.svelte
+++ b/web-common/src/layout/ApplicationHeader.svelte
@@ -18,7 +18,7 @@
   import { featureFlags } from "@rilldata/web-common/features/feature-flags.ts";
   import { useProjectTitle } from "@rilldata/web-common/features/project/selectors";
   import { isDeployPage } from "@rilldata/web-common/layout/navigation/route-utils";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { get } from "svelte/store";
   import { parseDocument } from "yaml";
   import InputWithConfirm from "../components/forms/InputWithConfirm.svelte";
@@ -27,10 +27,11 @@
   import Tag from "../components/tag/Tag.svelte";
 
   const { deploy, developerChat, stickyDashboardState } = featureFlags;
+  const runtimeClient = useRuntimeClient();
 
   export let mode: string;
 
-  $: ({ instanceId } = $runtime);
+  $: ({ instanceId } = runtimeClient);
 
   $: ({
     params: { name: dashboardName },
diff --git a/web-common/src/metrics/initMetrics.ts b/web-common/src/metrics/initMetrics.ts
index 4e2a5c1d140..5ef0236f3d1 100644
--- a/web-common/src/metrics/initMetrics.ts
+++ b/web-common/src/metrics/initMetrics.ts
@@ -18,8 +18,11 @@ export let actionEvent: ActiveEventHandler;
 export let behaviourEvent: BehaviourEventHandler;
 export let errorEventHandler: ErrorEventHandler;
 
-export async function initMetrics(localConfig: GetMetadataResponse) {
-  metricsService = new MetricsService(new RillIntakeClient(), [
+export async function initMetrics(
+  localConfig: GetMetadataResponse,
+  host: string,
+) {
+  metricsService = new MetricsService(new RillIntakeClient(host), [
     new ProductHealthEventFactory(),
     new BehaviourEventFactory(),
     new ErrorEventFactory(),
diff --git a/web-common/src/metrics/service/RillIntakeClient.ts b/web-common/src/metrics/service/RillIntakeClient.ts
index f902e64bf7b..893c705aed7 100644
--- a/web-common/src/metrics/service/RillIntakeClient.ts
+++ b/web-common/src/metrics/service/RillIntakeClient.ts
@@ -1,6 +1,4 @@
 import type { MetricsEvent } from "./MetricsTypes";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { get } from "svelte/store";
 
 const RillIntakeUser = import.meta.env.RILL_UI_PUBLIC_INTAKE_USER;
 const RillIntakePassword = import.meta.env.RILL_UI_PUBLIC_INTAKE_PASSWORD;
@@ -11,8 +9,10 @@ export interface TelemetryClient {
 
 export class RillIntakeClient implements TelemetryClient {
   private readonly authHeader: string;
+  private readonly host: string;
 
-  public constructor() {
+  public constructor(host: string) {
+    this.host = host;
     // this is the format rill-intake expects.
     this.authHeader =
       "Basic " + btoa(`${RillIntakeUser}:${RillIntakePassword}`);
@@ -22,7 +22,7 @@ export class RillIntakeClient implements TelemetryClient {
     if (!RillIntakeUser || !RillIntakePassword) return;
 
     try {
-      const resp = await fetch(`${get(runtime).host}/local/track`, {
+      const resp = await fetch(`${this.host}/local/track`, {
         method: "POST",
         body: JSON.stringify(event),
         headers: {
diff --git a/web-common/src/runtime-client/v2/runtime-client.ts b/web-common/src/runtime-client/v2/runtime-client.ts
index c600c2b1feb..9f542d5271f 100644
--- a/web-common/src/runtime-client/v2/runtime-client.ts
+++ b/web-common/src/runtime-client/v2/runtime-client.ts
@@ -13,6 +13,7 @@ import { RequestQueue, createQueueInterceptor } from "./request-queue";
 export type AuthContext = "user" | "mock" | "magic" | "embed";
 
 export class RuntimeClient {
+  readonly host: string;
   readonly instanceId: string;
   readonly transport: Transport;
   readonly requestQueue: RequestQueue;
@@ -33,6 +34,7 @@ export class RuntimeClient {
     jwt?: string;
     authContext?: AuthContext;
   }) {
+    this.host = opts.host;
     this.instanceId = opts.instanceId;
     this.currentJwt = opts.jwt;
     this.jwtReceivedAt = opts.jwt ? Date.now() : 0;
diff --git a/web-local/src/routes/(viz)/explore/[name]/+page.svelte b/web-local/src/routes/(viz)/explore/[name]/+page.svelte
index 18942c80bb0..53c162f3d53 100644
--- a/web-local/src/routes/(viz)/explore/[name]/+page.svelte
+++ b/web-local/src/routes/(viz)/explore/[name]/+page.svelte
@@ -15,12 +15,15 @@
   import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import type { PageData } from "./$types";
 
+  const runtimeClient = useRuntimeClient();
+
   export let data: PageData;
   $: ({ metricsView, explore, exploreName } = data);
 
-  resetSelectedMockUserAfterNavigate(queryClient);
+  resetSelectedMockUserAfterNavigate(queryClient, runtimeClient.instanceId);
 
   $: metricsViewName = metricsView?.meta?.name?.name as string;
 
diff --git a/web-local/src/routes/+layout.svelte b/web-local/src/routes/+layout.svelte
index 1dea30d3395..70d539847ac 100644
--- a/web-local/src/routes/+layout.svelte
+++ b/web-local/src/routes/+layout.svelte
@@ -48,7 +48,7 @@
       config.analyticsEnabled && !import.meta.env.VITE_PLAYWRIGHT_TEST && !dev;
 
     if (shouldSendAnalytics) {
-      await initMetrics(config); // Proxies events through the Rill "intake" service
+      await initMetrics(config, host); // Proxies events through the Rill "intake" service
       initPosthog(config.version);
       posthogIdentify(config.userId, {
         installId: config.installId,

From fe3b39027728490fa24c9552b50b4912ac085fee Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Wed, 25 Feb 2026 11:03:01 +0300
Subject: [PATCH 26/27] fix: update conversation tests to use mock
 `RuntimeClient`

Replace the old `runtime-store` mock with a `RuntimeClient` stub,
matching the updated `Conversation` constructor signature.
---
 .../features/chat/core/conversation.spec.ts    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/web-common/src/features/chat/core/conversation.spec.ts b/web-common/src/features/chat/core/conversation.spec.ts
index 3841e844e5b..437e814e50a 100644
--- a/web-common/src/features/chat/core/conversation.spec.ts
+++ b/web-common/src/features/chat/core/conversation.spec.ts
@@ -4,6 +4,7 @@ import {
   type V1GetConversationResponse,
   type V1Message,
 } from "@rilldata/web-common/runtime-client";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import { get } from "svelte/store";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { Conversation } from "./conversation";
@@ -24,15 +25,6 @@ vi.mock("@rilldata/web-common/runtime-client", async (importOriginal) => {
   };
 });
 
-vi.mock("@rilldata/web-common/runtime-client/runtime-store", () => ({
-  runtime: {
-    subscribe: (fn: (value: { host: string }) => void) => {
-      fn({ host: "http://localhost:9009" });
-      return () => {};
-    },
-  },
-}));
-
 import { runtimeServiceForkConversation } from "@rilldata/web-common/runtime-client";
 
 // =============================================================================
@@ -40,6 +32,12 @@ import { runtimeServiceForkConversation } from "@rilldata/web-common/runtime-cli
 // =============================================================================
 
 const INSTANCE_ID = "test-instance";
+
+const mockRuntimeClient = {
+  host: "http://localhost:9009",
+  instanceId: INSTANCE_ID,
+  getJwt: () => undefined,
+} as unknown as RuntimeClient;
 const ORIGINAL_CONVERSATION_ID = "original-conv-123";
 const FORKED_CONVERSATION_ID = "forked-conv-456";
 
@@ -95,7 +93,7 @@ function mockForkEmptyResponse() {
 }
 
 function createConversation(conversationId: string = ORIGINAL_CONVERSATION_ID) {
-  return new Conversation(INSTANCE_ID, conversationId);
+  return new Conversation(mockRuntimeClient, conversationId);
 }
 
 async function sendMessageAndIgnoreStreamError(

From 2102ddd9b8b4827c36e2e0b88721ee378bc8cf66 Mon Sep 17 00:00:00 2001
From: Eric P Green <ericpgreen2@gmail.com>
Date: Wed, 25 Feb 2026 12:45:43 +0300
Subject: [PATCH 27/27] refactor: migrate remaining `.ts` modules from runtime
 store to RuntimeClient

- Create `local-runtime-config.ts` with shared `LOCAL_HOST` and
  `LOCAL_INSTANCE_ID` constants for web-local
- Migrate web-local load functions and layout to use constants instead
  of reading from the runtime store
- Add `getJwt` parameter to `SSEFetchClient.start()`, removing its
  direct import of the runtime store
- Thread `RuntimeClient` through `updateDevJWT` (dual-write bridge)
- Decouple `local-service.ts` from runtime store via `setLocalServiceHost()`
- Replace `Runtime` type import in `selectors.ts` with inline type
- Rewrite `query-options.ts` to use `fetch` instead of `httpClient`
- Rewrite `open-query.ts` to use `fetch` instead of `httpClient`
- Rewrite `getFeatureFlags()` to use `fetch` instead of `httpClient`
- Migrate `download-report.ts` to accept `host` via mutation data
---
 .../src/features/projects/download-report.ts  |   4 +-
 web-admin/src/features/projects/selectors.ts  |  18 ++--
 .../-/reports/[report]/export/+page.svelte    |   1 +
 .../src/features/chat/core/conversation.ts    |   1 +
 .../ViewAsButton.svelte                       |   4 +-
 .../resetSelectedMockUserAfterNavigate.ts     |   6 +-
 .../granular-access-policies/updateDevJWT.ts  |   7 +-
 .../features/explore-mappers/open-query.ts    | 102 +++++++++---------
 web-common/src/features/feature-flags.ts      |  93 ++++++++--------
 .../src/runtime-client/local-service.ts       |  20 ++--
 .../src/runtime-client/query-options.ts       |  39 ++++---
 .../src/runtime-client/sse-fetch-client.ts    |  14 ++-
 web-local/src/hooks.client.ts                 |  17 ++-
 web-local/src/lib/local-runtime-config.ts     |   7 ++
 web-local/src/lib/time-ranges-test.ts         |   5 +-
 .../src/routes/(viz)/-/open-query/+page.ts    |  14 +--
 .../routes/(viz)/explore/[name]/+page.svelte  |   6 +-
 .../src/routes/(viz)/explore/[name]/+page.ts  |   5 +-
 web-local/src/routes/+layout.svelte           |   5 +-
 web-local/src/routes/+layout.ts               |   5 +-
 20 files changed, 204 insertions(+), 169 deletions(-)
 create mode 100644 web-local/src/lib/local-runtime-config.ts

diff --git a/web-admin/src/features/projects/download-report.ts b/web-admin/src/features/projects/download-report.ts
index 6e8c38fed67..f6506526309 100644
--- a/web-admin/src/features/projects/download-report.ts
+++ b/web-admin/src/features/projects/download-report.ts
@@ -4,7 +4,6 @@ import {
   createQueryServiceExportReport,
   type RpcStatus,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import {
   createMutation,
   type CreateMutationOptions,
@@ -17,6 +16,7 @@ export type DownloadReportRequest = {
   reportId: string;
   executionTime: string;
   originBaseUrl: string;
+  host: string;
 };
 
 export function createDownloadReportMutation<
@@ -48,7 +48,7 @@ export function createDownloadReportMutation<
         originBaseUrl: data.originBaseUrl,
       },
     });
-    const downloadUrl = `${get(runtime).host}${exportResp.downloadUrlPath}`;
+    const downloadUrl = `${data.host}${exportResp.downloadUrlPath}`;
     window.open(downloadUrl, "_self");
   };
 
diff --git a/web-admin/src/features/projects/selectors.ts b/web-admin/src/features/projects/selectors.ts
index e3e870be916..08414e86f7c 100644
--- a/web-admin/src/features/projects/selectors.ts
+++ b/web-admin/src/features/projects/selectors.ts
@@ -20,7 +20,6 @@ import {
   useResourceV2,
 } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import { derived, type Readable } from "svelte/store";
 
 export function getProjectPermissions(orgName: string, projName: string) {
@@ -137,13 +136,16 @@ export async function fetchProjectDeploymentDetails(
   return {
     projectPermissions: projResp.projectPermissions,
     project: projResp.project,
-    runtime: <Runtime>{
-      host: projResp.deployment?.runtimeHost,
-      instanceId: projResp.deployment?.runtimeInstanceId,
-      jwt: {
-        token: projResp.jwt,
-        authContext: token ? "magic" : "user",
-      },
+    runtime: {
+      host: projResp.deployment?.runtimeHost ?? "",
+      instanceId: projResp.deployment?.runtimeInstanceId ?? "",
+      jwt: projResp.jwt
+        ? {
+            token: projResp.jwt,
+            receivedAt: Date.now(),
+            authContext: (token ? "magic" : "user") as string,
+          }
+        : undefined,
     },
   };
 }
diff --git a/web-admin/src/routes/[organization]/[project]/-/reports/[report]/export/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/reports/[report]/export/+page.svelte
index e65a6c005d6..cab71cf2217 100644
--- a/web-admin/src/routes/[organization]/[project]/-/reports/[report]/export/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/reports/[report]/export/+page.svelte
@@ -26,6 +26,7 @@
         reportId,
         executionTime,
         originBaseUrl: window.location.origin,
+        host: $runtime.host,
       },
     });
   }
diff --git a/web-common/src/features/chat/core/conversation.ts b/web-common/src/features/chat/core/conversation.ts
index 9595d00f3cc..a2a5d3c6bad 100644
--- a/web-common/src/features/chat/core/conversation.ts
+++ b/web-common/src/features/chat/core/conversation.ts
@@ -361,6 +361,7 @@ export class Conversation {
     await this.sseClient!.start(baseUrl, {
       method: "POST",
       body: requestBody,
+      getJwt: () => this.client.getJwt(),
     });
   }
 
diff --git a/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte b/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
index d5a5dd8d6b7..af799bfa41d 100644
--- a/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
+++ b/web-common/src/features/dashboards/granular-access-policies/ViewAsButton.svelte
@@ -45,7 +45,7 @@
         active={viewAsMenuOpen}
         removeTooltipText="Clear view"
         onRemove={() => {
-          updateDevJWT(queryClient, instanceId, null);
+          updateDevJWT(queryClient, instanceId, null, client);
         }}
       >
         <div slot="body">
@@ -62,7 +62,7 @@
       {#each $mockUsers.data as user (user?.email)}
         <DropdownMenu.Item
           on:click={() => {
-            updateDevJWT(queryClient, instanceId, user);
+            updateDevJWT(queryClient, instanceId, user, client);
           }}
           class="flex gap-x-2 items-center"
         >
diff --git a/web-common/src/features/dashboards/granular-access-policies/resetSelectedMockUserAfterNavigate.ts b/web-common/src/features/dashboards/granular-access-policies/resetSelectedMockUserAfterNavigate.ts
index e1c10eababf..a32027c8390 100644
--- a/web-common/src/features/dashboards/granular-access-policies/resetSelectedMockUserAfterNavigate.ts
+++ b/web-common/src/features/dashboards/granular-access-policies/resetSelectedMockUserAfterNavigate.ts
@@ -1,6 +1,7 @@
 import { beforeNavigate } from "$app/navigation";
 import { selectedMockUserStore } from "@rilldata/web-common/features/dashboards/granular-access-policies/stores";
 import { updateDevJWT } from "@rilldata/web-common/features/dashboards/granular-access-policies/updateDevJWT";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { QueryClient } from "@tanstack/svelte-query";
 import { get } from "svelte/store";
 
@@ -16,6 +17,7 @@ import { get } from "svelte/store";
 export function resetSelectedMockUserAfterNavigate(
   queryClient: QueryClient,
   instanceId: string,
+  runtimeClient?: RuntimeClient,
 ) {
   beforeNavigate(({ to, from }) => {
     if (!to?.params || !from?.params) return;
@@ -24,7 +26,9 @@ export function resetSelectedMockUserAfterNavigate(
       from.params.name !== to.params.name &&
       get(selectedMockUserStore) !== null
     ) {
-      updateDevJWT(queryClient, instanceId, null).catch(console.error);
+      updateDevJWT(queryClient, instanceId, null, runtimeClient).catch(
+        console.error,
+      );
     }
   });
 }
diff --git a/web-common/src/features/dashboards/granular-access-policies/updateDevJWT.ts b/web-common/src/features/dashboards/granular-access-policies/updateDevJWT.ts
index 34440c8e10e..e520327be6f 100644
--- a/web-common/src/features/dashboards/granular-access-policies/updateDevJWT.ts
+++ b/web-common/src/features/dashboards/granular-access-policies/updateDevJWT.ts
@@ -6,17 +6,21 @@ import type { MockUser } from "@rilldata/web-common/features/dashboards/granular
 import { runtimeServiceIssueDevJWT } from "@rilldata/web-common/runtime-client";
 import { invalidateAllMetricsViews } from "@rilldata/web-common/runtime-client/invalidation";
 import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import type { RuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 import type { QueryClient } from "@tanstack/svelte-query";
 
 export async function updateDevJWT(
   queryClient: QueryClient,
   instanceId: string,
   mockUser: MockUser | null,
+  runtimeClient?: RuntimeClient,
 ) {
   selectedMockUserStore.set(mockUser);
 
   if (mockUser === null) {
     selectedMockUserJWT.set(null);
+    runtimeClient?.updateJwt(undefined, "user");
+    // BRIDGE (temporary): keep global store in sync for unmigrated consumers
     runtime.update((runtimeState) => {
       runtimeState.jwt = undefined;
       return runtimeState;
@@ -36,7 +40,8 @@ export async function updateDevJWT(
       if (!jwt) throw new Error("No JWT returned");
 
       selectedMockUserJWT.set(jwt);
-
+      runtimeClient?.updateJwt(jwt, "mock");
+      // BRIDGE (temporary): keep global store in sync for unmigrated consumers
       runtime.update((runtimeState) => {
         runtimeState.jwt = {
           token: jwt,
diff --git a/web-common/src/features/explore-mappers/open-query.ts b/web-common/src/features/explore-mappers/open-query.ts
index b795d56bee2..7217580eaab 100644
--- a/web-common/src/features/explore-mappers/open-query.ts
+++ b/web-common/src/features/explore-mappers/open-query.ts
@@ -15,13 +15,41 @@ import {
 } from "@rilldata/web-common/runtime-client";
 import type { Schema as MetricsResolverQuery } from "@rilldata/web-common/runtime-client/gen/resolvers/metrics/schema.ts";
 import { error, redirect } from "@sveltejs/kit";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
-import httpClient from "@rilldata/web-common/runtime-client/http-client.ts";
 import { getTimeControlState } from "@rilldata/web-common/features/dashboards/time-controls/time-control-store.ts";
 import { convertPartialExploreStateToUrlParams } from "@rilldata/web-common/features/dashboards/url-state/convert-partial-explore-state-to-url-params.ts";
 import { createLinkError } from "@rilldata/web-common/features/explore-mappers/explore-validation.ts";
 import { ExploreLinkErrorType } from "@rilldata/web-common/features/explore-mappers/types.ts";
 
+interface RuntimeInfo {
+  host: string;
+  instanceId: string;
+  jwt?: { token: string } | undefined;
+}
+
+async function runtimeFetch<T>(
+  runtime: RuntimeInfo,
+  path: string,
+  opts?: { method?: string; body?: unknown; signal?: AbortSignal },
+): Promise<T> {
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+  };
+  if (runtime.jwt) {
+    headers["Authorization"] = `Bearer ${runtime.jwt.token}`;
+  }
+  const resp = await fetch(`${runtime.host}${path}`, {
+    method: opts?.method ?? "GET",
+    headers,
+    ...(opts?.body !== undefined ? { body: JSON.stringify(opts.body) } : {}),
+    signal: opts?.signal,
+  });
+  if (!resp.ok) {
+    const data = await resp.json().catch(() => ({}));
+    throw { response: { status: resp.status, data } };
+  }
+  return (await resp.json()) as T;
+}
+
 export async function openQuery({
   query,
   organization,
@@ -29,7 +57,7 @@ export async function openQuery({
   runtime,
 }: {
   query: MetricsResolverQuery;
-  runtime: Runtime;
+  runtime: RuntimeInfo;
   organization?: string;
   project?: string;
 }) {
@@ -90,30 +118,21 @@ export async function openQuery({
  * TODO: try to find an explore that has as many measures/dimensions in the query
  */
 async function findExploreForMetricsView(
-  runtime: Runtime,
+  runtime: RuntimeInfo,
   metricsViewName: string,
 ): Promise<string> {
-  // List all explore resources
   const exploreResources = await queryClient.fetchQuery({
     queryKey: getRuntimeServiceListResourcesQueryKey(runtime.instanceId, {
       kind: ResourceKind.Explore,
     }),
     queryFn: ({ signal }) =>
-      httpClient<V1ListResourcesResponse>({
-        url: `/v1/instances/${runtime.instanceId}/resources`,
-        method: "GET",
-        params: { kind: ResourceKind.Explore },
-        signal,
-        baseUrl: runtime.host,
-        headers: runtime.jwt
-          ? {
-              Authorization: `Bearer ${runtime.jwt?.token}`,
-            }
-          : undefined,
-      }),
+      runtimeFetch<V1ListResourcesResponse>(
+        runtime,
+        `/v1/instances/${runtime.instanceId}/resources?kind=${ResourceKind.Explore}`,
+        { signal },
+      ),
   });
 
-  // Look for an explore that references this metrics view
   if (exploreResources.resources) {
     for (const resource of exploreResources.resources) {
       if (resource.explore?.state?.validSpec?.metricsView === metricsViewName) {
@@ -122,31 +141,22 @@ async function findExploreForMetricsView(
     }
   }
 
-  // If no explore found, throw an error
   throw new Error(
     `No explore dashboard found for metrics view: ${metricsViewName}`,
   );
 }
 
-async function getExploreSpecs(runtime: Runtime, exploreName: string) {
-  // Get explore and metrics view specs
+async function getExploreSpecs(runtime: RuntimeInfo, exploreName: string) {
   const getExploreResponse = await queryClient.fetchQuery({
     queryKey: getRuntimeServiceGetExploreQueryKey(runtime.instanceId, {
       name: exploreName,
     }),
     queryFn: ({ signal }) =>
-      httpClient<V1GetExploreResponse>({
-        url: `/v1/instances/${runtime.instanceId}/resources/explore`,
-        method: "GET",
-        params: { name: exploreName },
-        signal,
-        baseUrl: runtime.host,
-        headers: runtime.jwt
-          ? {
-              Authorization: `Bearer ${runtime.jwt?.token}`,
-            }
-          : undefined,
-      }),
+      runtimeFetch<V1GetExploreResponse>(
+        runtime,
+        `/v1/instances/${runtime.instanceId}/resources/explore?name=${encodeURIComponent(exploreName)}`,
+        { signal },
+      ),
   });
   const exploreResource = getExploreResponse.explore;
   const metricsViewResource = getExploreResponse.metricsView;
@@ -169,7 +179,7 @@ async function getExploreSpecs(runtime: Runtime, exploreName: string) {
  * Generates the explore page URL with proper search parameters
  */
 async function generateExploreLink(
-  runtime: Runtime,
+  runtime: RuntimeInfo,
   exploreState: Partial<ExploreState>,
   metricsViewSpec: V1MetricsViewSpec,
   exploreSpec: V1ExploreSpec,
@@ -178,7 +188,6 @@ async function generateExploreLink(
   project?: string | undefined,
 ): Promise<string> {
   try {
-    // Build base URL
     const url = getUrlForExplore(exploreName, organization, project);
 
     const metricsViewName = exploreSpec.metricsView;
@@ -186,21 +195,11 @@ async function generateExploreLink(
     if (metricsViewSpec.timeDimension && metricsViewName) {
       fullTimeRange = await queryClient.fetchQuery({
         queryFn: ({ signal }) =>
-          httpClient<V1MetricsViewTimeRangeResponse>({
-            url: `/v1/instances/${runtime.instanceId}/queries/metrics-views/${metricsViewName}/time-range-summary`,
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-              ...(runtime.jwt
-                ? {
-                    Authorization: `Bearer ${runtime.jwt?.token}`,
-                  }
-                : {}),
-            },
-            data: {},
-            signal,
-            baseUrl: runtime.host,
-          }),
+          runtimeFetch<V1MetricsViewTimeRangeResponse>(
+            runtime,
+            `/v1/instances/${runtime.instanceId}/queries/metrics-views/${encodeURIComponent(metricsViewName)}/time-range-summary`,
+            { method: "POST", body: {}, signal },
+          ),
         queryKey: getQueryServiceMetricsViewTimeRangeQueryKey(
           runtime.instanceId,
           metricsViewName,
@@ -211,9 +210,6 @@ async function generateExploreLink(
       });
     }
 
-    // This is just for an initial redirect.
-    // DashboardStateDataLoader will handle compression etc. during init
-    // So no need to use getCleanedUrlParamsForGoto
     const searchParams = convertPartialExploreStateToUrlParams(
       exploreSpec,
       metricsViewSpec,
diff --git a/web-common/src/features/feature-flags.ts b/web-common/src/features/feature-flags.ts
index 8240d6369ca..b704d3d22b0 100644
--- a/web-common/src/features/feature-flags.ts
+++ b/web-common/src/features/feature-flags.ts
@@ -6,8 +6,7 @@ import {
   type V1GetInstanceResponse,
   type V1InstanceFeatureFlags,
 } from "../runtime-client";
-import { type Runtime, runtime } from "../runtime-client/runtime-store";
-import httpClient from "@rilldata/web-common/runtime-client/http-client.ts";
+import { runtime } from "../runtime-client/runtime-store";
 
 class FeatureFlag {
   private _internal = false;
@@ -73,29 +72,9 @@ class FeatureFlags {
       this._resolveReady = resolve;
     });
 
-    const updateFlags = (userFlags: V1InstanceFeatureFlags) => {
-      this._resolveReady();
-
-      // First, reset all user flags to their defaults
-      const userFlagKeys = Object.keys(this).filter((key) => {
-        const flag = this[key];
-        return flag instanceof FeatureFlag && !flag.internalOnly;
-      });
-
-      for (const key of userFlagKeys) {
-        const flag = this[key] as FeatureFlag;
-        flag.resetToDefault();
-      }
-
-      // Then apply project-specific overrides
-      for (const key in userFlags) {
-        const flag = this[key] as FeatureFlag | undefined;
-        if (!flag || flag.internalOnly) continue;
-        flag.set(userFlags[key]);
-      }
-    };
-
-    // Responsively update flags based rill.yaml
+    // Responsively update flags based on rill.yaml
+    // BRIDGE (temporary): subscribes to runtime store; will be replaced by
+    // RuntimeProvider calling setRuntimeClient() once per-runtime scoping lands
     runtime.subscribe((runtime) => {
       if (!runtime?.instanceId) return;
 
@@ -109,11 +88,33 @@ class FeatureFlags {
         },
         queryClient,
       ).subscribe((features) => {
-        if (features.data) updateFlags(features.data);
+        if (features.data) this.updateFlags(features.data);
       });
     });
   }
 
+  private updateFlags(userFlags: V1InstanceFeatureFlags) {
+    this._resolveReady();
+
+    // First, reset all user flags to their defaults
+    const userFlagKeys = Object.keys(this).filter((key) => {
+      const flag = this[key];
+      return flag instanceof FeatureFlag && !flag.internalOnly;
+    });
+
+    for (const key of userFlagKeys) {
+      const flag = this[key] as FeatureFlag;
+      flag.resetToDefault();
+    }
+
+    // Then apply project-specific overrides
+    for (const key in userFlags) {
+      const flag = this[key] as FeatureFlag | undefined;
+      if (!flag || flag.internalOnly) continue;
+      flag.set(userFlags[key]);
+    }
+  }
+
   get set() {
     return (bool: boolean, ...toggleFlags: FeatureFlagKey[]) => {
       toggleFlags.forEach((n) => {
@@ -127,24 +128,24 @@ class FeatureFlags {
 
 export const featureFlags = new FeatureFlags();
 
-export async function getFeatureFlags(runtime: Runtime) {
-  const instanceResp = await queryClient.fetchQuery({
-    queryKey: getRuntimeServiceGetInstanceQueryKey(
-      runtime.instanceId,
-      undefined,
-    ),
-    queryFn: () =>
-      httpClient<V1GetInstanceResponse>({
-        url: `/v1/instances/${runtime.instanceId}`,
-        method: "GET",
-        baseUrl: runtime.host,
-        headers: runtime.jwt
-          ? {
-              Authorization: `Bearer ${runtime.jwt?.token}`,
-            }
-          : undefined,
-      }),
-  });
-
-  return instanceResp.instance?.featureFlags ?? {};
+interface RuntimeInfo {
+  host: string;
+  instanceId: string;
+  jwt?: { token: string } | undefined;
+}
+
+export async function getFeatureFlags(runtime: RuntimeInfo) {
+  const resp = await fetch(
+    `${runtime.host}/v1/instances/${runtime.instanceId}`,
+    {
+      headers: runtime.jwt
+        ? { Authorization: `Bearer ${runtime.jwt.token}` }
+        : {},
+    },
+  );
+  if (!resp.ok) {
+    return {};
+  }
+  const data = (await resp.json()) as V1GetInstanceResponse;
+  return data.instance?.featureFlags ?? {};
 }
diff --git a/web-common/src/runtime-client/local-service.ts b/web-common/src/runtime-client/local-service.ts
index 186ece960ca..2669a54ae50 100644
--- a/web-common/src/runtime-client/local-service.ts
+++ b/web-common/src/runtime-client/local-service.ts
@@ -20,7 +20,6 @@ import {
   GitPushRequest,
   GithubRepoStatusRequest,
 } from "@rilldata/web-common/proto/gen/rill/local/v1/api_pb";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import {
   createMutation,
   createQuery,
@@ -30,7 +29,6 @@ import {
   type DataTag,
   type QueryKey,
 } from "@tanstack/svelte-query";
-import { get } from "svelte/store";
 
 /**
  * Handwritten wrapper on LocalService.
@@ -42,15 +40,23 @@ const clients = new Map<
   string,
   ReturnType<typeof createPromiseClient<typeof LocalService>>
 >();
-function getClient() {
-  const host = get(runtime).host;
-  if (clients.has(host)) return clients.get(host)!;
+
+let defaultHost = "";
+
+/** Set the default host for LocalService calls. Called once at app init. */
+export function setLocalServiceHost(host: string) {
+  defaultHost = host;
+}
+
+function getClient(host?: string) {
+  const h = host ?? defaultHost;
+  if (clients.has(h)) return clients.get(h)!;
 
   const transport = createConnectTransport({
-    baseUrl: host,
+    baseUrl: h,
   });
   const client = createPromiseClient(LocalService, transport);
-  clients.set(host, client);
+  clients.set(h, client);
   return client;
 }
 
diff --git a/web-common/src/runtime-client/query-options.ts b/web-common/src/runtime-client/query-options.ts
index bbc7a29cd45..b195796d5d1 100644
--- a/web-common/src/runtime-client/query-options.ts
+++ b/web-common/src/runtime-client/query-options.ts
@@ -5,27 +5,36 @@ import type {
 } from "./gen/index.schemas";
 import type { RuntimeServiceGetResourceQueryResult } from "./gen/runtime-service/runtime-service";
 import { getRuntimeServiceGetResourceQueryKey } from "./gen/runtime-service/runtime-service";
-import httpClient from "@rilldata/web-common/runtime-client/http-client.ts";
-import type { Runtime } from "@rilldata/web-common/runtime-client/runtime-store.ts";
+
+interface RuntimeInfo {
+  host: string;
+  instanceId: string;
+  jwt?: { token: string } | undefined;
+}
 
 export function getRuntimeServiceGetResourceQueryOptions(
-  runtime: Runtime,
+  runtime: RuntimeInfo,
   params: RuntimeServiceGetResourceParams,
 ) {
   return <FetchQueryOptions<RuntimeServiceGetResourceQueryResult>>{
     queryKey: getRuntimeServiceGetResourceQueryKey(runtime.instanceId, params),
-    queryFn: () =>
-      httpClient<V1GetResourceResponse>({
-        url: `/v1/instances/${runtime.instanceId}/resource`,
-        method: "GET",
-        params,
-        baseUrl: runtime.host,
-        headers: runtime.jwt
-          ? {
-              Authorization: `Bearer ${runtime.jwt?.token}`,
-            }
-          : undefined,
-      }),
+    queryFn: async () => {
+      const searchParams = new URLSearchParams();
+      for (const [key, value] of Object.entries(params)) {
+        if (value !== undefined) searchParams.set(key, String(value));
+      }
+      const url = `${runtime.host}/v1/instances/${runtime.instanceId}/resource?${searchParams}`;
+      const headers: Record<string, string> = {};
+      if (runtime.jwt) {
+        headers["Authorization"] = `Bearer ${runtime.jwt.token}`;
+      }
+      const resp = await fetch(url, { headers });
+      if (!resp.ok) {
+        const data = await resp.json().catch(() => ({}));
+        throw { response: { status: resp.status, data } };
+      }
+      return (await resp.json()) as V1GetResourceResponse;
+    },
     staleTime: Infinity,
   };
 }
diff --git a/web-common/src/runtime-client/sse-fetch-client.ts b/web-common/src/runtime-client/sse-fetch-client.ts
index 517aa0814ab..4f32245f5bf 100644
--- a/web-common/src/runtime-client/sse-fetch-client.ts
+++ b/web-common/src/runtime-client/sse-fetch-client.ts
@@ -1,5 +1,3 @@
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { get } from "svelte/store";
 import { EventEmitter } from "@rilldata/web-common/lib/event-emitter.ts";
 
 /**
@@ -118,12 +116,18 @@ export class SSEFetchClient {
       method?: "GET" | "POST";
       body?: Record<string, unknown>;
       headers?: Record<string, string>;
+      getJwt?: () => string | undefined;
     } = {},
   ): Promise<void> {
     // Clean up any existing connection
     this.stop();
 
-    const { method = "GET", body, headers: customHeaders = {} } = options;
+    const {
+      method = "GET",
+      body,
+      headers: customHeaders = {},
+      getJwt,
+    } = options;
 
     // Prepare headers with authentication
     const headers: Record<string, string> = {
@@ -131,9 +135,9 @@ export class SSEFetchClient {
       ...customHeaders,
     };
 
-    const jwt = get(runtime).jwt;
+    const jwt = getJwt?.();
     if (jwt) {
-      headers["Authorization"] = `Bearer ${jwt.token}`;
+      headers["Authorization"] = `Bearer ${jwt}`;
     }
 
     try {
diff --git a/web-local/src/hooks.client.ts b/web-local/src/hooks.client.ts
index 6282936bdaa..03c92bcf75f 100644
--- a/web-local/src/hooks.client.ts
+++ b/web-local/src/hooks.client.ts
@@ -1,14 +1,9 @@
-import { dev } from "$app/environment";
 import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { setLocalServiceHost } from "@rilldata/web-common/runtime-client/local-service";
+import { LOCAL_HOST, LOCAL_INSTANCE_ID } from "./lib/local-runtime-config";
 
-/** INITIALIZE RUNTIME STORE **/
-// When testing, we need to use the relative path to the server
-const HOST = dev ? "http://localhost:9009" : "";
-const INSTANCE_ID = "default";
+// BRIDGE (temporary): keep global store initialized for unmigrated Orval consumers
+runtime.set({ host: LOCAL_HOST, instanceId: LOCAL_INSTANCE_ID });
 
-const runtimeInit = {
-  host: HOST,
-  instanceId: INSTANCE_ID,
-};
-
-runtime.set(runtimeInit);
+// Initialize LocalService client with the runtime host
+setLocalServiceHost(LOCAL_HOST);
diff --git a/web-local/src/lib/local-runtime-config.ts b/web-local/src/lib/local-runtime-config.ts
new file mode 100644
index 00000000000..1be5dedb5ca
--- /dev/null
+++ b/web-local/src/lib/local-runtime-config.ts
@@ -0,0 +1,7 @@
+// Detect dev mode without depending on SvelteKit's $app/environment
+// (which is unavailable to tsc outside Vite/SvelteKit context)
+const isDev =
+  typeof import.meta.env !== "undefined" && import.meta.env.DEV === true;
+
+export const LOCAL_HOST = isDev ? "http://localhost:9009" : "";
+export const LOCAL_INSTANCE_ID = "default";
diff --git a/web-local/src/lib/time-ranges-test.ts b/web-local/src/lib/time-ranges-test.ts
index c5570800aac..202f2efba16 100644
--- a/web-local/src/lib/time-ranges-test.ts
+++ b/web-local/src/lib/time-ranges-test.ts
@@ -2,8 +2,7 @@ import {
   queryServiceMetricsViewTimeRanges,
   queryServiceMetricsViewTimeRange,
 } from "@rilldata/web-common/runtime-client";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { get } from "svelte/store";
+import { LOCAL_INSTANCE_ID } from "./local-runtime-config";
 import { Interval, DateTime, type DateTimeUnit } from "luxon";
 import { GrainAliasToOrder } from "@rilldata/web-common/lib/time/new-grains";
 
@@ -336,7 +335,7 @@ function generateFirstNPeriodTests(metadata: TimeMetadata, n: number = 3) {
 }
 
 export async function runTests(metricsViewName: string) {
-  const instanceId = get(runtime).instanceId;
+  const instanceId = LOCAL_INSTANCE_ID;
 
   let failures = 1;
 
diff --git a/web-local/src/routes/(viz)/-/open-query/+page.ts b/web-local/src/routes/(viz)/-/open-query/+page.ts
index 942696c0be5..7c638622873 100644
--- a/web-local/src/routes/(viz)/-/open-query/+page.ts
+++ b/web-local/src/routes/(viz)/-/open-query/+page.ts
@@ -1,13 +1,15 @@
 import { openQuery } from "@rilldata/web-common/features/explore-mappers/open-query";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { get } from "svelte/store";
+import {
+  LOCAL_HOST,
+  LOCAL_INSTANCE_ID,
+} from "../../../../lib/local-runtime-config";
 import { getQueryFromUrl } from "@rilldata/web-common/features/chat/core/citation-url-utils.ts";
 
 export async function load({ url }) {
-  const rt = get(runtime);
-
   const query = getQueryFromUrl(url);
 
-  // Open the query (this'll redirect to the relevant Explore page)
-  await openQuery({ query, runtime: rt });
+  await openQuery({
+    query,
+    runtime: { host: LOCAL_HOST, instanceId: LOCAL_INSTANCE_ID },
+  });
 }
diff --git a/web-local/src/routes/(viz)/explore/[name]/+page.svelte b/web-local/src/routes/(viz)/explore/[name]/+page.svelte
index 53c162f3d53..e08ec243bf6 100644
--- a/web-local/src/routes/(viz)/explore/[name]/+page.svelte
+++ b/web-local/src/routes/(viz)/explore/[name]/+page.svelte
@@ -23,7 +23,11 @@
   export let data: PageData;
   $: ({ metricsView, explore, exploreName } = data);
 
-  resetSelectedMockUserAfterNavigate(queryClient, runtimeClient.instanceId);
+  resetSelectedMockUserAfterNavigate(
+    queryClient,
+    runtimeClient.instanceId,
+    runtimeClient,
+  );
 
   $: metricsViewName = metricsView?.meta?.name?.name as string;
 
diff --git a/web-local/src/routes/(viz)/explore/[name]/+page.ts b/web-local/src/routes/(viz)/explore/[name]/+page.ts
index 65190eb9a1a..4dc334650bb 100644
--- a/web-local/src/routes/(viz)/explore/[name]/+page.ts
+++ b/web-local/src/routes/(viz)/explore/[name]/+page.ts
@@ -1,10 +1,9 @@
 import { fetchExploreSpec } from "@rilldata/web-common/features/explores/selectors";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+import { LOCAL_INSTANCE_ID } from "../../../../lib/local-runtime-config";
 import { error } from "@sveltejs/kit";
-import { get } from "svelte/store";
 
 export const load = async ({ params, depends }) => {
-  const { instanceId } = get(runtime);
+  const instanceId = LOCAL_INSTANCE_ID;
 
   const exploreName = params.name;
 
diff --git a/web-local/src/routes/+layout.svelte b/web-local/src/routes/+layout.svelte
index 70d539847ac..04b82b55c9b 100644
--- a/web-local/src/routes/+layout.svelte
+++ b/web-local/src/routes/+layout.svelte
@@ -21,7 +21,7 @@
     initMetrics,
   } from "@rilldata/web-common/metrics/initMetrics";
   import { localServiceGetMetadata } from "@rilldata/web-common/runtime-client/local-service";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import { LOCAL_HOST, LOCAL_INSTANCE_ID } from "$lib/local-runtime-config";
   import RuntimeProvider from "@rilldata/web-common/runtime-client/v2/RuntimeProvider.svelte";
   import type { Query } from "@tanstack/query-core";
   import { QueryClientProvider } from "@tanstack/svelte-query";
@@ -70,7 +70,8 @@
     return () => removeJavascriptListeners?.();
   });
 
-  $: ({ host, instanceId } = $runtime);
+  const host = LOCAL_HOST;
+  const instanceId = LOCAL_INSTANCE_ID;
 
   $: ({ route } = $page);
 
diff --git a/web-local/src/routes/+layout.ts b/web-local/src/routes/+layout.ts
index 8b41f444f3e..5f4856f1c79 100644
--- a/web-local/src/routes/+layout.ts
+++ b/web-local/src/routes/+layout.ts
@@ -1,8 +1,6 @@
 export const ssr = false;
 
 import { redirect } from "@sveltejs/kit";
-import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-import { get } from "svelte/store";
 import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient.js";
 import {
   getRuntimeServiceListFilesQueryKey,
@@ -10,6 +8,7 @@ import {
   type V1ListFilesResponse,
 } from "@rilldata/web-common/runtime-client/index.js";
 import { handleUninitializedProject } from "@rilldata/web-common/features/welcome/is-project-initialized.js";
+import { LOCAL_INSTANCE_ID } from "../lib/local-runtime-config";
 import { Settings } from "luxon";
 
 Settings.defaultLocale = "en";
@@ -17,7 +16,7 @@ Settings.defaultLocale = "en";
 export async function load({ url, depends, untrack }) {
   depends("init");
 
-  const instanceId = get(runtime).instanceId;
+  const instanceId = LOCAL_INSTANCE_ID;
 
   const files = await queryClient.fetchQuery<V1ListFilesResponse>({
     queryKey: getRuntimeServiceListFilesQueryKey(instanceId, undefined),