refactor: migrate runtime context from global store to scoped RuntimeClient

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))" \
@@ -65,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
 

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

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(

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(

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");
   };
 

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,
     },
   };
 }

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}

web-admin/src/routes/[organization]/[project]/-/reports/[report]/export/+page.svelte

@@ -26,6 +26,7 @@
         reportId,
         executionTime,
         originBaseUrl: window.location.origin,
+        host: $runtime.host,
       },
     });
   }

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",

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";
+}