okengine 0.14.1 → 0.16.0

package/src/console/ui-next/src/features/store/lib/rls-policy.ts

@@ -2,15 +2,27 @@
  * Console helpers for RLS policy create (SQL preview + templates).
  */
 
+import type {
+  ColumnClassification,
+  DeclaredColumn,
+  Manifest,
+  Table,
+} from "../../../../../../manifest/types.ts";
 import {
   buildCreatePolicySql,
   buildRowSecuritySql,
   parseSqlPolicySpec,
   quotePgIdent,
+  formatPolicyRole,
+  emitPgPolicySource,
+  emitStoreSchemaPolicySource,
   type SqlPolicyBehavior,
   type SqlPolicyCommand,
   type SqlPolicySpec,
 } from "../../../../../../drivers/pg-rls.ts";
+import { fkColumnStem } from "./schema-graph.ts";
+
+export { emitPgPolicySource, emitStoreSchemaPolicySource };
 
 export type { SqlPolicyBehavior, SqlPolicyCommand, SqlPolicySpec };
 export { buildCreatePolicySql, buildRowSecuritySql, parseSqlPolicySpec };
@@ -28,7 +40,8 @@ export type RlsPolicyTemplate = {
   readonly withCheck?: string;
 };
 
-const OKE_GATE = "current_setting('oke.gate', true)";
+const OKE_GATE = "oke.gate()";
+const OKE_USER = "oke.user()";
 
 /** Common Postgres RLS starters — OKE Gate / owner / join, no vendor auth helpers. */
 export const RLS_POLICY_TEMPLATES: readonly RlsPolicyTemplate[] = [
@@ -52,14 +65,14 @@ export const RLS_POLICY_TEMPLATES: readonly RlsPolicyTemplate[] = [
     id: "owner-read",
     name: "owner_read",
     title: "Enable read for owners",
-    detail: "SELECT when a text owner column matches current_user.",
+    detail: "SELECT when a text owner column matches oke.user().",
     command: "SELECT",
-    using: "owner = current_user",
+    using: `owner = ${OKE_USER}`,
   },
   {
     id: "gate-read",
     name: "gate_read",
-    title: "Enable read when oke.gate matches",
+    title: "Enable read when oke.gate() matches",
     detail: `SELECT when ${OKE_GATE} equals a Gate name (pair Policy & scope).`,
     command: "SELECT",
     using: `${OKE_GATE} = 'member'`,
@@ -70,8 +83,7 @@ export const RLS_POLICY_TEMPLATES: readonly RlsPolicyTemplate[] = [
     title: "Enable read via a related table",
     detail: "SELECT with EXISTS against members — membership joins, not a column on this table.",
     command: "SELECT",
-    using:
-      "exists (select 1 from members m where m.user_id = current_user and m.team_id = team_id)",
+    using: "exists (select 1 from members m where m.user_id = oke.user() and m.team_id = team_id)",
   },
   {
     id: "insert-all",
@@ -85,14 +97,14 @@ export const RLS_POLICY_TEMPLATES: readonly RlsPolicyTemplate[] = [
     id: "insert-owner",
     name: "insert_owner",
     title: "Enable insert for owners",
-    detail: "INSERT WITH CHECK so new rows set owner to current_user.",
+    detail: "INSERT WITH CHECK so new rows set owner to oke.user().",
     command: "INSERT",
-    withCheck: "owner = current_user",
+    withCheck: `owner = ${OKE_USER}`,
   },
   {
     id: "insert-gate",
     name: "insert_gate",
-    title: "Enable insert when oke.gate matches",
+    title: "Enable insert when oke.gate() matches",
     detail: `INSERT WITH CHECK when ${OKE_GATE} equals a Gate name.`,
     command: "INSERT",
     withCheck: `${OKE_GATE} = 'member'`,
@@ -101,15 +113,15 @@ export const RLS_POLICY_TEMPLATES: readonly RlsPolicyTemplate[] = [
     id: "update-owner",
     name: "update_owner",
     title: "Enable update for owners",
-    detail: "UPDATE own rows. USING and WITH CHECK both require owner = current_user.",
+    detail: "UPDATE own rows. USING and WITH CHECK both require owner = oke.user().",
     command: "UPDATE",
-    using: "owner = current_user",
-    withCheck: "owner = current_user",
+    using: `owner = ${OKE_USER}`,
+    withCheck: `owner = ${OKE_USER}`,
   },
   {
     id: "update-gate",
     name: "update_gate",
-    title: "Enable update when oke.gate matches",
+    title: "Enable update when oke.gate() matches",
     detail: `UPDATE when ${OKE_GATE} equals a Gate name.`,
     command: "UPDATE",
     using: `${OKE_GATE} = 'member'`,
@@ -119,9 +131,9 @@ export const RLS_POLICY_TEMPLATES: readonly RlsPolicyTemplate[] = [
     id: "delete-owner",
     name: "delete_owner",
     title: "Enable delete for owners",
-    detail: "DELETE when a text owner column matches current_user.",
+    detail: "DELETE when a text owner column matches oke.user().",
     command: "DELETE",
-    using: "owner = current_user",
+    using: `owner = ${OKE_USER}`,
   },
   {
     id: "deny-delete",
@@ -135,15 +147,15 @@ export const RLS_POLICY_TEMPLATES: readonly RlsPolicyTemplate[] = [
     id: "all-owner",
     name: "owner_all",
     title: "Enable all commands for owners",
-    detail: "ALL commands when owner = current_user (USING and WITH CHECK).",
+    detail: "ALL commands when owner = oke.user() (USING and WITH CHECK).",
     command: "ALL",
-    using: "owner = current_user",
-    withCheck: "owner = current_user",
+    using: `owner = ${OKE_USER}`,
+    withCheck: `owner = ${OKE_USER}`,
   },
   {
     id: "all-gate",
     name: "gate_all",
-    title: "Enable all commands when oke.gate matches",
+    title: "Enable all commands when oke.gate() matches",
     detail: `ALL commands when ${OKE_GATE} equals a Gate name.`,
     command: "ALL",
     using: `${OKE_GATE} = 'member'`,
@@ -153,7 +165,7 @@ export const RLS_POLICY_TEMPLATES: readonly RlsPolicyTemplate[] = [
     id: "restrictive-gate",
     name: "restrictive_gate",
     title: "Restrictive extra Gate check",
-    detail: "RESTRICTIVE policy ANDs with permissive ones. Requires oke.gate to be set.",
+    detail: "RESTRICTIVE policy ANDs with permissive ones. Requires oke.gate() to be set.",
     command: "ALL",
     behavior: "RESTRICTIVE",
     using: `${OKE_GATE} is not null`,
@@ -262,17 +274,207 @@ export function rlsGateActionsForMode(mode: RlsGateMode): readonly string[] {
  * @param spec - Policy fields
  * @param enableRls - Also enable RLS on the table
  */
+/**
+ * Code-dock sources: `store.schema.policy` plus Drizzle `pgPolicy`.
+ *
+ * @param spec - Policy fields
+ */
+export function rlsPolicyCodeSource(spec: SqlPolicySpec): string {
+  return `${emitStoreSchemaPolicySource(spec)}\n\n${emitPgPolicySource(spec)}`;
+}
+
+/**
+ * USING / WITH CHECK from Advanced Gate picks (never Postgres `TO`).
+ *
+ * @param gates - Selected policy / public / scope names
+ */
+export function rlsGatePredicateSql(gates: readonly string[]): string {
+  if (gates.length === 0) return "true";
+  return gates
+    .map((gate) => {
+      const lit = `'${gate.replaceAll("'", "''")}'`;
+      return gate.includes(":") ? `oke.has_scope(${lit})` : `oke.gate() = ${lit}`;
+    })
+    .join(" OR ");
+}
+
 export function rlsPolicyPreviewSql(spec: SqlPolicySpec, enableRls: boolean): string {
   const create = formatCreatePolicyPreview(spec);
   if (!enableRls) return `${create};`;
   return `${buildRowSecuritySql(spec.table, true)};\n${create};`;
 }
 
+/** SQL names owner templates bind to, first match wins. */
+const OWNER_SQL_NAMES = [
+  "owner",
+  "owner_id",
+  "owner_email",
+  "user_id",
+  "created_by",
+  "creator",
+  "creator_id",
+  "creator_email",
+  "author",
+  "author_id",
+  "author_email",
+] as const;
+
+/** One Manifest column for the identity select (PK / FK / unique marks). */
+export type RlsTableColumn = {
+  readonly sqlName: string;
+  readonly primaryKey: boolean;
+  readonly foreignKey: boolean;
+  readonly unique: boolean;
+  /** FK inferred from `*_id` when Manifest omitted `.references()`. */
+  readonly inferred: boolean;
+};
+
+/**
+ * Manifest columns with PK / FK / unique marks (`sqlName`, else snake_case).
+ *
+ * @param manifest - Current Manifest, or null
+ * @param storeRef - Store effect ref (`sql:db`)
+ * @param table - Table name
+ */
+export function rlsTableColumns(
+  manifest: Manifest | null,
+  storeRef: string,
+  table: string,
+): readonly RlsTableColumn[] {
+  const cut = storeRef.indexOf(":");
+  const storeName = cut >= 0 ? storeRef.slice(cut + 1) : storeRef;
+  const cols = manifest?.stores?.[storeName]?.tables?.[table]?.columns ?? {};
+  return Object.entries(cols).map(([key, col]) => {
+    const sqlName = sqlNameOf(key, col);
+    const declared = isDeclaredColumn(col) ? col : null;
+    const primaryKey = declared?.primaryKey === true;
+    const declaredFk = declared?.references?.table !== undefined;
+    const inferred = !declaredFk && !primaryKey && fkColumnStem(sqlName) !== null;
+    return {
+      sqlName,
+      primaryKey,
+      foreignKey: declaredFk || inferred,
+      unique: declared?.unique === true && !primaryKey,
+      inferred,
+    };
+  });
+}
+
+/**
+ * SQL column names on a Manifest table (`sqlName`, else snake_case key).
+ *
+ * @param manifest - Current Manifest, or null
+ * @param storeRef - Store effect ref (`sql:db`)
+ * @param table - Table name
+ */
+export function rlsTableSqlColumns(
+  manifest: Manifest | null,
+  storeRef: string,
+  table: string,
+): readonly string[] {
+  return rlsTableColumns(manifest, storeRef, table).map((col) => col.sqlName);
+}
+
+function isDeclaredColumn(col: DeclaredColumn | ColumnClassification): col is DeclaredColumn {
+  return (
+    "type" in col ||
+    "nullable" in col ||
+    "primaryKey" in col ||
+    "unique" in col ||
+    "sqlName" in col ||
+    "description" in col ||
+    "references" in col ||
+    "default" in col
+  );
+}
+
+/**
+ * Best owner-like SQL column for owner templates, or null.
+ *
+ * @param sqlNames - Table SQL column names
+ */
+export function rlsOwnerColumn(sqlNames: readonly string[]): string | null {
+  const byLower = new Map(sqlNames.map((name) => [name.toLowerCase(), name]));
+  for (const name of OWNER_SQL_NAMES) {
+    const hit = byLower.get(name);
+    if (hit) return hit;
+  }
+  return null;
+}
+
+/**
+ * Replace the generic `owner` placeholder with the table's owner column.
+ *
+ * @param expr - USING / WITH CHECK body
+ * @param ownerCol - SQL column to bind
+ */
+export function rlsBindOwnerExpr(expr: string, ownerCol: string): string {
+  return expr.replace(/\bowner\b/g, ownerCol);
+}
+
+/**
+ * True when the expression still uses the unbound `owner` placeholder.
+ *
+ * @param expr - USING / WITH CHECK body
+ */
+export function rlsExprNeedsOwnerColumn(expr: string): boolean {
+  return /\bowner\b/.test(expr);
+}
+
+/**
+ * True when a template compares a row to `oke.user()` via `owner`.
+ *
+ * @param tpl - Policy template
+ */
+export function rlsTemplateUsesOwner(tpl: Pick<RlsPolicyTemplate, "using" | "withCheck">): boolean {
+  return rlsExprNeedsOwnerColumn(tpl.using ?? "") || rlsExprNeedsOwnerColumn(tpl.withCheck ?? "");
+}
+
+/**
+ * True when the expression is an owner / `oke.user()` identity check.
+ *
+ * @param expr - USING / WITH CHECK body
+ */
+export function rlsExprUsesUserIdentity(expr: string): boolean {
+  return rlsExprNeedsOwnerColumn(expr) || /oke\.user\(\)/.test(expr);
+}
+
+/**
+ * Rewrite `owner` or a previous identity column to `to`.
+ *
+ * @param expr - USING / WITH CHECK body
+ * @param from - Previous SQL column (or `owner`)
+ * @param to - Selected SQL column
+ */
+export function rlsRewriteIdentityColumn(expr: string, from: string, to: string): string {
+  if (!to || from === to) return expr;
+  let next = expr;
+  if (rlsExprNeedsOwnerColumn(next)) next = rlsBindOwnerExpr(next, to);
+  if (from !== "" && from !== "owner") {
+    next = next.replace(new RegExp(`\\b${escapeIdent(from)}\\b`, "g"), to);
+  }
+  return next;
+}
+
+function escapeIdent(name: string): string {
+  return name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+function sqlNameOf(key: string, col: NonNullable<Table["columns"]>[string]): string {
+  if (col && typeof col === "object" && "sqlName" in col && typeof col.sqlName === "string") {
+    return col.sqlName;
+  }
+  return key
+    .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
+    .replace(/([A-Z])([A-Z][a-z])/g, "$1_$2")
+    .toLowerCase();
+}
+
 function formatCreatePolicyPreview(spec: SqlPolicySpec): string {
   const roles =
     spec.roles.length === 0
       ? "public"
-      : spec.roles.map((role) => (role === "public" ? "public" : quotePgIdent(role))).join(", ");
+      : spec.roles.map((role) => formatPolicyRole(role)).join(", ");
   const lines = [
     `CREATE POLICY ${quotePgIdent(spec.name)}`,
     `  ON ${quotePgIdent(spec.table)}`,

package/src/console/ui-next/src/features/store/lib/schema-graph.ts

@@ -35,6 +35,8 @@ export type SchemaGraphTable = {
   readonly storeName: string;
   readonly storeRef: string;
   readonly columns: readonly SchemaGraphColumn[];
+  /** Manifest `rls` or any declared policies. */
+  readonly rls?: boolean;
 };
 
 /** Custom data on a schema-visualizer table node. */
@@ -138,11 +140,13 @@ export function schemaGraphTables(
     if (store.facet !== "sql") continue;
     for (const child of store.children) {
       if (isSqlCatalogChild(child)) continue;
+      const declared = manifest?.stores?.[store.name]?.tables?.[child.name];
       out.push({
         id: child.effectRef,
         name: child.name,
         storeName: store.name,
         storeRef: store.ref,
+        rls: declared?.rls === true || Object.keys(declared?.policies ?? {}).length > 0,
         columns: columnsForChild(
           store,
           child.name,

package/src/console/ui-next/src/features/store/lib/sql-catalog.test.ts

@@ -6,6 +6,7 @@ import {
   isSqlExtensionChild,
   isSqlPolicyChild,
   storeChildLabel,
+  storeChildRlsPolicyCount,
   storeChildShowsRls,
 } from "./sql-catalog.ts";
 
@@ -48,6 +49,29 @@ describe("sql catalog children", () => {
     expect(storeChildShowsRls(child("policies", "policy"))).toBe(false);
   });
 
+  test("RLS policy count prefers the store-list stamp", () => {
+    const stamped = { ...child("bookings", "table"), rls: true, rlsPolicyCount: 2 };
+    expect(storeChildRlsPolicyCount(stamped, null, "db")).toBe(2);
+    expect(
+      storeChildRlsPolicyCount(
+        child("bookings", "table"),
+        {
+          oke: "1.0",
+          app: "t",
+          stores: {
+            db: {
+              facet: "sql",
+              tables: {
+                bookings: { policies: { mine: { using: "true" }, team: { using: "true" } } },
+              },
+            },
+          },
+        },
+        "db",
+      ),
+    ).toBe(2);
+  });
+
   test("splits tables from catalog folders", () => {
     const grouped = groupSqlChildren([
       child("bookings", "table"),

package/src/console/ui-next/src/features/store/lib/sql-catalog.ts

@@ -3,6 +3,7 @@
  * extensions / RLS policies).
  */
 
+import type { Manifest } from "../../../../../../manifest/types.ts";
 import type { StoreListChild } from "@/client.ts";
 
 /** Catalog kind on a SQL store child. */
@@ -64,6 +65,24 @@ export function storeChildShowsRls(child: StoreListChild): boolean {
   return child.kind === "table" && typeof child.rls === "boolean";
 }
 
+/**
+ * Policy count for the resource-header RLS chip.
+ *
+ * Prefers the store-list stamp; falls back to Manifest `table.policies`.
+ *
+ * @param child - Store-list child
+ * @param manifest - Current Manifest, or null
+ * @param storeName - Manifest store key
+ */
+export function storeChildRlsPolicyCount(
+  child: StoreListChild,
+  manifest: Manifest | null,
+  storeName: string,
+): number {
+  if (typeof child.rlsPolicyCount === "number") return child.rlsPolicyCount;
+  return Object.keys(manifest?.stores?.[storeName]?.tables?.[child.name]?.policies ?? {}).length;
+}
+
 /**
  * Tree / header label for a child (`Indexes` instead of `indexes`).
  *

package/src/console/ui-next/src/features/store/lib/store-tree.test.ts

@@ -18,6 +18,7 @@ import {
   storeTreeIsOpen,
   storeTreeOpenKeys,
   isSingletonStoreLeaf,
+  resourceHeaderChildRef,
   storeTreeTablesKey,
   toggleHiddenFacet,
   visibleFacetBands,
@@ -143,6 +144,11 @@ describe("store-tree", () => {
     expect(storeTreeAncestorKeys(STORES, "index:comments")).toEqual(["facet:index"]);
   });
 
+  test("resource header drops the child ref when it repeats the store", () => {
+    expect(resourceHeaderChildRef("kv:reminders", "kv:reminders")).toBeNull();
+    expect(resourceHeaderChildRef("sql:db", "sql:shipments")).toBe("sql:shipments");
+  });
+
   test("ancestor keys open the facet, store, and Tables folder for a table", () => {
     expect(storeTreeAncestorKeys(STORES, "sql:shipments")).toEqual([
       "facet:sql",

package/src/console/ui-next/src/features/store/lib/store-tree.ts

@@ -6,6 +6,8 @@ import { DatabaseIcon, File01Icon, Key01Icon, Search01Icon } from "@hugeicons/co
 import type { StoreFacet, StoreListChild, StoreListStore } from "@/client.ts";
 import type { ElementHugeIcon } from "@/lib/element-icons.ts";
 import { isStoreFacet, STORE_FACETS } from "./parse-resource-ref.ts";
+
+export { STORE_FACETS };
 import { isSqlCatalogChild, storeChildLabel } from "./sql-catalog.ts";
 
 /** Facet band label for the left explorer. */
@@ -153,6 +155,17 @@ export function isSingletonStoreLeaf(store: StoreListStore): boolean {
   return store.children.length === 1 && only !== undefined && only.name === store.name;
 }
 
+/**
+ * Child ref in the resource header. Null when it repeats the store
+ * (`kv:reminders · kv:reminders`).
+ *
+ * @param storeRef - Store identity (`kv:reminders`)
+ * @param effectRef - Selected child (`kv:reminders` or `sql:tasks`)
+ */
+export function resourceHeaderChildRef(storeRef: string, effectRef: string): string | null {
+  return storeRef === effectRef ? null : effectRef;
+}
+
 /**
  * Open-state key for a facet band in {@link StoreTree}.
  *

package/src/console/ui-next/src/features/store/query/query-console.tsx

@@ -60,9 +60,10 @@ import { kvSetPatch, parseKvQuery } from "../lib/kv-query.ts";
 import {
   defaultKvQuery,
   defaultSqlQuery,
-  firstChildName,
+  randomChildName,
   isConsoleAuthStore,
   pickQueryStore,
+  reconcileDefaultQuery,
 } from "../lib/query-defaults.ts";
 import {
   addQueryTab,
@@ -138,10 +139,12 @@ export function QueryConsole({
   );
   const store = ofFacet.find((s) => s.ref === storeRef) ?? pickQueryStore(ofFacet, facet, null);
   const seed = seedEditor(store, facet, selectedEffectRef);
+  const childNames = store?.children.map((child) => child.name) ?? [];
 
-  const [tabs, setTabs] = useState<readonly QueryTab[]>(
-    () => loadQueryTabs(facet) ?? [{ id: "q_1", title: "Query 1", text: seed }],
-  );
+  const [tabs, setTabs] = useState<readonly QueryTab[]>(() => {
+    const loaded = loadQueryTabs(facet) ?? [{ id: "q_1", title: "Query 1", text: seed }];
+    return reconcileLoadedTabs(loaded, childNames, facet);
+  });
   const [activeId, setActiveId] = useState(() => tabs[0]?.id ?? "q_1");
   const active = tabs.find((t) => t.id === activeId) ?? tabs[0];
   const text = active?.text ?? seed;
@@ -153,7 +156,10 @@ export function QueryConsole({
   const [kvPending, setKvPending] = useState(false);
   const [schemaOpen, setSchemaOpen] = useState(false);
   const [piiMasked, setPiiMasked] = useState(true);
-  const [asGate, setAsGate] = useState<string | null>(null);
+  const [rlsAs, setRlsAs] = useState<{ asGate: string | null; asUserId: string | null }>({
+    asGate: null,
+    asUserId: null,
+  });
   const [resultsOpen, setResultsOpen] = useState(true);
   const [history, setHistory] = useState<readonly QueryHistoryEntry[]>(() =>
     loadQueryHistory(facet),
@@ -194,6 +200,13 @@ export function QueryConsole({
     setStoreRef((prev) => (ofFacet.some((s) => s.ref === prev) ? prev : next.ref));
   }, [stores, facet, selectedEffectRef, ofFacet]);
 
+  const childKey = childNames.join("\0");
+  useEffect(() => {
+    const names = childKey.length === 0 ? [] : childKey.split("\0");
+    if (names.length === 0) return;
+    setTabs((prev) => reconcileLoadedTabs(prev, names, facet));
+  }, [childKey, facet]);
+
   useEffect(() => {
     saveQueryTabs(facet, tabs);
   }, [facet, tabs]);
@@ -256,7 +269,7 @@ export function QueryConsole({
     setExecuted(set?.executed ?? next.map((row) => row.executed).join("\n") ?? null);
   };
 
-  const runBatch = (texts: readonly string[], includePii = !piiMasked, gate = asGate): void => {
+  const runBatch = (texts: readonly string[], includePii = !piiMasked, gate = rlsAs): void => {
     if (!store) return;
     setResultsOpen(true);
     setError(null);
@@ -290,7 +303,8 @@ export function QueryConsole({
               sql: sqlText,
               ...(writing ? { allowWrite: true } : {}),
               ...(includePii ? { revealPii: true } : {}),
-              ...(gate ? { asGate: gate } : {}),
+              ...(gate.asGate ? { asGate: gate.asGate } : {}),
+              ...(gate.asUserId ? { asUserId: gate.asUserId } : {}),
               ...(tenant ? { tenant } : {}),
             });
             const changed = writeChanges(data.rows);
@@ -302,8 +316,13 @@ export function QueryConsole({
             ];
             if (data.masked) bits.push("PII masked");
             else if (includePii) bits.push("PII visible");
-            if (data.asGate) {
-              bits.push(data.gateApplied ? `as ${data.asGate}` : `as ${data.asGate} (not applied)`);
+            if (data.rls?.gate ?? data.asGate) {
+              const label = data.rls?.userId
+                ? `${data.rls.gate} / ${data.rls.userId}`
+                : (data.rls?.gate ?? data.asGate);
+              bits.push(
+                data.gateApplied || data.rls?.applied ? `as ${label}` : `as ${label} (not applied)`,
+              );
             }
             nextSets.push({
               label: sqlStatementLabel(sqlText),
@@ -351,7 +370,7 @@ export function QueryConsole({
     })();
   };
 
-  const runText = (sqlText: string, includePii = !piiMasked, gate = asGate): void => {
+  const runText = (sqlText: string, includePii = !piiMasked, gate = rlsAs): void => {
     if (!store) return;
     setResultsOpen(true);
     setError(null);
@@ -876,9 +895,9 @@ export function QueryConsole({
         {isSql ? (
           <QueryGateMenu
             manifest={manifest}
-            asGate={asGate}
+            value={rlsAs}
             onChange={(next) => {
-              setAsGate(next);
+              setRlsAs(next);
               if (executed && !isSqlWrite(executed)) {
                 runText(executed, !piiMasked, next);
               }
@@ -916,7 +935,6 @@ export function QueryConsole({
                 <HugeiconsIcon icon={PlayIcon} className="size-3.5" />
               )}
               {selected ? "Run selection" : "Run"}
-              <ShortcutKeys keys={runKeys} className="hidden sm:inline-flex" />
             </Button>
           </ToolbarTip>
           {isSql ? (
@@ -1060,6 +1078,22 @@ function writeChanges(rows: readonly QueryResultRow[]): number | null {
   return typeof changes === "number" && Number.isFinite(changes) ? changes : null;
 }
 
+/** Rewrite leftover default seeds that name a table the live store dropped. */
+function reconcileLoadedTabs(
+  tabs: readonly QueryTab[],
+  names: readonly string[],
+  facet: StoreQueryFacet,
+): readonly QueryTab[] {
+  let changed = false;
+  const next = tabs.map((tab) => {
+    const text = reconcileDefaultQuery(tab.text, names, facet);
+    if (text === tab.text) return tab;
+    changed = true;
+    return { ...tab, text };
+  });
+  return changed ? next : tabs;
+}
+
 function seedEditor(
   store: StoreListStore | null | undefined,
   facet: StoreQueryFacet,
@@ -1069,7 +1103,7 @@ function seedEditor(
   const selected = selectedEffectRef
     ? store.children.find((c) => c.effectRef === selectedEffectRef)?.name
     : undefined;
-  const name = selected ?? firstChildName(store);
+  const name = selected ?? randomChildName(store);
   return facet === "sql" ? defaultSqlQuery(name) : defaultKvQuery(name ? `${name}:` : undefined);
 }