@youtyan/code-viewer 0.2.2 → 0.2.4

package/web/app.js

@@ -633,12 +633,14 @@
       }
       case "/database": {
         const db = params.get("db") || undefined;
+        const schema = params.get("schema") || undefined;
         const table = params.get("table") || undefined;
         const tabRaw = params.get("tab");
         const tab = tabRaw === "data" || tabRaw === "query" || tabRaw === "schema" || tabRaw === "er" || tabRaw === "search" || tabRaw === "snapshot" ? tabRaw : undefined;
         return {
           screen: "database",
           ...db ? { db } : {},
+          ...schema ? { schema } : {},
           ...table ? { table } : {},
           ...tab ? { tab } : {},
           range
@@ -694,6 +696,8 @@
         const params = new URLSearchParams;
         if (route.db)
           params.set("db", route.db);
+        if (route.schema)
+          params.set("schema", route.schema);
         if (route.table)
           params.set("table", route.table);
         if (route.tab)
@@ -7303,6 +7307,8 @@ ${frontmatter.yaml}
         const parts = ["Database"];
         if (entry.target.db)
           parts.push(entry.target.db);
+        if (entry.target.schema)
+          parts.push(entry.target.schema);
         if (entry.target.table)
           parts.push(entry.target.table);
         if (entry.target.tab)
@@ -7326,6 +7332,8 @@ ${frontmatter.yaml}
       const target = entry.target;
       if (target.db && target.db !== route.db)
         return false;
+      if (target.schema && target.schema !== route.schema)
+        return false;
       if (target.table && target.table !== route.table)
         return false;
       if (target.tab && target.tab !== (route.tab || "data"))
@@ -7647,7 +7655,9 @@ ${frontmatter.yaml}
       return firstLine.length > 90 ? `${firstLine.slice(0, 90)}…` : firstLine;
     }
     function databaseAnnotationTitle(target) {
-      const parts = [target.table || target.db || "Database"];
+      const parts = [target.table || target.schema || target.db || "Database"];
+      if (target.schema && target.table)
+        parts.unshift(target.schema);
       if (target.tab === "data" && target.data?.search)
         parts.push(`search: ${target.data.search}`);
       else if (target.tab === "query" && target.query?.sql)
@@ -7954,6 +7964,7 @@ ${frontmatter.yaml}
         deps.setRoute({
           screen: "database",
           db: target.db,
+          schema: target.schema,
           table: target.table,
           tab: target.tab,
           range: deps.currentRange()
@@ -8481,6 +8492,9 @@ ${frontmatter.yaml}
   function isMakefileName(name) {
     return /^makefile(?:[.-].+)?$/i.test(name);
   }
+  function isDotenvName(name) {
+    return /^(?:\.?env|.*\.env)(?:[.-].+)?$/i.test(name);
+  }
   function sourceDisplayKind(path) {
     if (isVideo(path))
       return "video";
@@ -8496,6 +8510,8 @@ ${frontmatter.yaml}
       return "text";
     if (TEXT_SOURCE_FILENAMES.has(name))
       return "text";
+    if (isDotenvName(name))
+      return "text";
     if (isDockerfileName(name) || isMakefileName(name))
       return "text";
     return "unsupported";
@@ -9391,6 +9407,7 @@ ${frontmatter.yaml}
       if (disposed)
         return;
       const dbId = deps.getDbId();
+      const schema = deps.getSchema();
       if (!dbId)
         return;
       const term = input.value.trim();
@@ -9411,6 +9428,7 @@ ${frontmatter.yaml}
           },
           body: JSON.stringify({
             db: dbId,
+            ...schema ? { schema } : {},
             term,
             includeNonText: nonTextCheck.checked
           })
@@ -9489,16 +9507,17 @@ ${frontmatter.yaml}
         return;
       const grouped = new Map;
       for (const h of hits) {
-        const existing = grouped.get(h.table) || [];
+        const key = h.schema ? `${h.schema}.${h.table}` : h.table;
+        const existing = grouped.get(key) || [];
         existing.push(h);
-        grouped.set(h.table, existing);
+        grouped.set(key, existing);
       }
-      for (const [table2, tableHits] of grouped) {
+      for (const [tableLabel, tableHits] of grouped) {
         const section = document.createElement("div");
         section.className = "db-search-table-section";
         const tableHeader = document.createElement("div");
         tableHeader.className = "db-search-table-header";
-        tableHeader.textContent = `${table2} (${tableHits.length}件)`;
+        tableHeader.textContent = `${tableLabel} (${tableHits.length}件)`;
         section.appendChild(tableHeader);
         const hitsList = document.createElement("div");
         hitsList.className = "db-search-hits-list";
@@ -9963,7 +9982,13 @@ ${frontmatter.yaml}
     }
     async function refresh() {
       const dbId = callbacks.getDbId();
-      const params = dbId ? `?db=${encodeURIComponent(dbId)}` : "";
+      const schema = callbacks.getSchema();
+      const searchParams = new URLSearchParams;
+      if (dbId)
+        searchParams.set("db", dbId);
+      if (schema)
+        searchParams.set("schema", schema);
+      const params = searchParams.toString() ? `?${searchParams.toString()}` : "";
       try {
         const res = await fetch(`/_db/history${params}`);
         if (!res.ok)
@@ -10176,13 +10201,14 @@ ${frontmatter.yaml}
         clearConfirmTimer = null;
       }
       try {
+        const schema = callbacks.getSchema();
         await fetch("/_db/history/clear", {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
             "X-Code-Viewer-Action": "1"
           },
-          body: JSON.stringify(dbId ? { db: dbId } : {})
+          body: JSON.stringify(dbId ? { db: dbId, ...schema ? { schema } : {} } : {})
         });
         entries = [];
         render();
@@ -11012,6 +11038,7 @@ ${frontmatter.yaml}
     });
     confirmBtn.addEventListener("click", async () => {
       const dbId = deps.getDbId();
+      const schema = deps.getSchema();
       if (!dbId)
         return;
       const tables = getSelectedTables();
@@ -11022,11 +11049,12 @@ ${frontmatter.yaml}
       try {
         await postJson("/_db/snapshot/create", {
           db: dbId,
+          ...schema ? { schema } : {},
           tables,
           note: noteInput.value.trim()
         });
         tableSelector.hidden = true;
-        scheduleAutoRefresh(dbId);
+        scheduleAutoRefresh(dbId, schema);
       } catch {} finally {
         if (!disposed) {
           confirmBtn.disabled = false;
@@ -11034,11 +11062,12 @@ ${frontmatter.yaml}
         }
       }
     });
-    function scheduleAutoRefresh(dbId) {
+    function scheduleAutoRefresh(dbId, schema) {
       const timer = setTimeout(() => {
         autoRefreshTimers.delete(timer);
-        if (disposed || deps.getDbId() !== dbId)
+        if (disposed || deps.getDbId() !== dbId || deps.getSchema() !== schema) {
           return;
+        }
         refreshAndAutoDiff();
       }, 3000);
       autoRefreshTimers.add(timer);
@@ -11046,17 +11075,22 @@ ${frontmatter.yaml}
     refreshBtn.addEventListener("click", refresh);
     async function refresh() {
       const dbId = deps.getDbId();
+      const schema = deps.getSchema();
       if (!dbId)
         return;
       try {
-        const snapRes = await fetch(`/_db/snapshot/list?db=${encodeURIComponent(dbId)}`);
+        const params = new URLSearchParams({ db: dbId });
+        if (schema)
+          params.set("schema", schema);
+        const snapRes = await fetch(`/_db/snapshot/list?${params}`);
         if (snapRes.ok) {
           const data = await snapRes.json();
-          if (disposed || deps.getDbId() !== dbId)
+          if (disposed || deps.getDbId() !== dbId || deps.getSchema() !== schema) {
             return;
+          }
           snapshots = data.snapshots;
         }
-        if (disposed || deps.getDbId() !== dbId)
+        if (disposed || deps.getDbId() !== dbId || deps.getSchema() !== schema)
           return;
         renderMain();
       } catch {}
@@ -11431,8 +11465,11 @@ ${frontmatter.yaml}
       try {
         const parsed = JSON.parse(data);
         const dbId = deps.getDbId();
+        const schema = deps.getSchema();
         if (parsed.dbId && dbId && parsed.dbId !== dbId)
           return;
+        if (parsed.schema && parsed.schema !== schema)
+          return;
         if (parsed.action === "started" && parsed.id) {
           setActiveSnapshotId(parsed.id);
         }
@@ -12395,6 +12432,9 @@ ${frontmatter.yaml}
   function isSqlKind(kind) {
     return kind === "sqlite" || kind === "postgresql" || kind === "mysql";
   }
+  function isPostgresKind(kind) {
+    return kind === "postgresql";
+  }
   function isSqlView(view) {
     return view === "data" || view === "query" || view === "schema" || view === "er" || view === "search" || view === "snapshot";
   }
@@ -12448,14 +12488,19 @@ ${frontmatter.yaml}
     let currentDbInfo = null;
     let schemaCache = null;
     let lastFiles = [];
+    let currentSchema = initial.schema ?? null;
     let currentTable = initial.table ?? null;
     let loadGeneration = 0;
     const dbSelect = document.createElement("select");
     dbSelect.className = "db-file-select";
     dbSelect.title = "Select database file";
+    const schemaSelect = document.createElement("select");
+    schemaSelect.className = "db-file-select db-schema-select";
+    schemaSelect.title = "Select PostgreSQL schema";
+    schemaSelect.hidden = true;
     const dbToolbar = document.createElement("div");
     dbToolbar.className = "db-toolbar";
-    dbToolbar.appendChild(dbSelect);
+    dbToolbar.append(dbSelect, schemaSelect);
     const tabBar = document.createElement("div");
     tabBar.className = "db-tab-bar";
     const tabData = createInnerTab("Data", true);
@@ -12546,14 +12591,17 @@ ${frontmatter.yaml}
     const schemaView = createSchemaView();
     const erDiagram = createErDiagram();
     const globalSearchView = createGlobalSearchView({
-      getDbId: () => currentDbInfo?.id || null
+      getDbId: () => currentDbInfo?.id || null,
+      getSchema: () => currentSchema
     });
     const snapshotView = createSnapshotView({
       getDbId: () => currentDbInfo?.id || null,
+      getSchema: () => currentSchema,
       getTables: () => schemaCache?.tables || []
     });
     const historyView = createQueryHistoryView({
       getDbId: () => currentDbInfo?.id || null,
+      getSchema: () => currentSchema,
       copySqlToQuery: (sql) => {
         queryEditor.setSql(sql);
         setActiveTab("query");
@@ -12695,6 +12743,7 @@ ${frontmatter.yaml}
         deps.setRoute({
           screen: "database",
           db: currentDbInfo?.id,
+          schema: currentSchema ?? undefined,
           table: currentTable ?? undefined,
           tab: currentTab === "data" ? undefined : currentTab,
           range: deps.currentRange()
@@ -12715,8 +12764,40 @@ ${frontmatter.yaml}
       const data = await res.json();
       return data;
     }
+    function withCurrentSchema(params) {
+      if (currentSchema)
+        params.set("schema", currentSchema);
+      return params;
+    }
+    async function fetchSchemas(dbId, preferredSchema) {
+      const params = new URLSearchParams({ db: dbId });
+      if (preferredSchema)
+        params.set("schema", preferredSchema);
+      const res = await deps.trackLoad(fetch(`/_db/schemas?${params}`));
+      if (!res.ok) {
+        throw new Error(await responseErrorMessage(res, "failed to fetch schemas"));
+      }
+      return await res.json();
+    }
+    function renderSchemaOptions(schemas, selected) {
+      schemaSelect.innerHTML = "";
+      for (const schema of schemas) {
+        const opt = document.createElement("option");
+        opt.value = schema;
+        opt.textContent = schema;
+        schemaSelect.appendChild(opt);
+      }
+      schemaSelect.hidden = schemas.length === 0;
+      schemaSelect.disabled = schemas.length === 0;
+      if (selected && schemas.includes(selected)) {
+        schemaSelect.value = selected;
+      } else if (schemas.length > 0) {
+        schemaSelect.value = schemas[0];
+      }
+    }
     async function fetchSchema(dbId) {
-      const res = await deps.trackLoad(fetch(`/_db/schema?db=${encodeURIComponent(dbId)}&includeColumns=1`));
+      const params = withCurrentSchema(new URLSearchParams({ db: dbId, includeColumns: "1" }));
+      const res = await deps.trackLoad(fetch(`/_db/schema?${params}`));
       if (!res.ok) {
         throw new Error(await responseErrorMessage(res, "failed to fetch schema"));
       }
@@ -12731,6 +12812,7 @@ ${frontmatter.yaml}
         offset: String(offset),
         limit: String(limit)
       });
+      withCurrentSchema(params);
       if (sort) {
         params.set("sort", sort.column);
         params.set("dir", sort.direction);
@@ -12755,6 +12837,7 @@ ${frontmatter.yaml}
         },
         body: JSON.stringify({
           db: currentDbInfo.id,
+          ...currentSchema ? { schema: currentSchema } : {},
           sql,
           saveHistory: true,
           source: "browser",
@@ -12769,11 +12852,13 @@ ${frontmatter.yaml}
         historyView.refresh();
       return result;
     }
-    async function selectDb(dbId, explorerInitial, generation = loadGeneration, preferredTable) {
+    async function selectDb(dbId, explorerInitial, generation = loadGeneration, preferredSchema, preferredTable) {
       if (generation !== loadGeneration || currentDbInfo?.id !== dbId)
         return;
       currentTable = null;
       if (currentDbInfo?.kind === "redis" || currentDbInfo?.kind === "elasticsearch") {
+        currentSchema = null;
+        renderSchemaOptions([], null);
         currentTab = "data";
         tableList.render([]);
         grid.clear();
@@ -12799,6 +12884,34 @@ ${frontmatter.yaml}
       tableList.render([]);
       setTableListStatus("Loading schema...");
       grid.clear();
+      if (isPostgresKind(currentDbInfo?.kind)) {
+        const desiredSchema = preferredSchema !== undefined ? preferredSchema : currentSchema;
+        const schemas = await fetchSchemas(dbId, desiredSchema).catch((err) => {
+          if (generation !== loadGeneration || currentDbInfo?.id !== dbId)
+            return;
+          const message = errorMessage(err);
+          currentSchema = null;
+          renderSchemaOptions([], null);
+          schemaCache = null;
+          tableList.render([]);
+          setTableListStatus(message, { error: true });
+          grid.showError(message);
+          schemaView.clear();
+          erDiagram.clear();
+          cb.onStateChange();
+          return null;
+        });
+        if (generation !== loadGeneration || currentDbInfo?.id !== dbId)
+          return;
+        if (!schemas)
+          return;
+        const schemaNames = schemas.schemas.map((s2) => s2.name);
+        currentSchema = schemas.selectedSchema || desiredSchema || (schemaNames.includes("public") ? "public" : schemaNames[0]) || null;
+        renderSchemaOptions(schemaNames, currentSchema);
+      } else {
+        currentSchema = null;
+        renderSchemaOptions([], null);
+      }
       const schema = await fetchSchema(dbId).catch((err) => {
         if (generation !== loadGeneration || currentDbInfo?.id !== dbId)
           return;
@@ -12817,6 +12930,7 @@ ${frontmatter.yaml}
         return;
       if (!schema)
         return;
+      currentSchema = schema.schema || currentSchema;
       schemaCache = schema;
       tableList.render(schema.tables);
       grid.clear();
@@ -12844,6 +12958,7 @@ ${frontmatter.yaml}
       deps.setRoute({
         screen: "database",
         db: currentDbInfo.id,
+        schema: currentSchema ?? undefined,
         table: table2,
         tab: currentTab === "data" ? undefined : currentTab,
         range: deps.currentRange()
@@ -12874,7 +12989,7 @@ ${frontmatter.yaml}
       }
       if (!currentDbInfo)
         return [];
-      const res = await fetch(`/_db/columns?db=${encodeURIComponent(currentDbInfo.id)}&table=${encodeURIComponent(table2)}`);
+      const res = await fetch(`/_db/columns?${withCurrentSchema(new URLSearchParams({ db: currentDbInfo.id, table: table2 }))}`);
       if (!res.ok)
         return [];
       const data = await res.json();
@@ -12892,7 +13007,7 @@ ${frontmatter.yaml}
         return;
       setActiveTab("schema");
       try {
-        const res = await fetch(`/_db/ddl?db=${encodeURIComponent(currentDbInfo.id)}&table=${encodeURIComponent(table2)}`);
+        const res = await fetch(`/_db/ddl?${withCurrentSchema(new URLSearchParams({ db: currentDbInfo.id, table: table2 }))}`);
         if (!res.ok)
           return;
         const data = await res.json();
@@ -12925,6 +13040,33 @@ ${frontmatter.yaml}
     dbSelect.addEventListener("change", () => {
       handleDbSelectChange();
     });
+    schemaSelect.addEventListener("change", () => {
+      handleSchemaSelectChange();
+    });
+    async function handleSchemaSelectChange() {
+      if (!currentDbInfo || !isPostgresKind(currentDbInfo.kind))
+        return;
+      const schema = schemaSelect.value || null;
+      if (!schema || schema === currentSchema)
+        return;
+      const dbId = currentDbInfo.id;
+      currentSchema = schema;
+      const generation = ++loadGeneration;
+      clearDockerNotice();
+      await selectDb(dbId, undefined, generation, schema, null);
+      if (generation !== loadGeneration || currentDbInfo?.id !== dbId || currentSchema !== schema) {
+        return;
+      }
+      deps.setRoute({
+        screen: "database",
+        db: dbId,
+        schema,
+        table: currentTable ?? undefined,
+        tab: currentTab === "data" ? undefined : currentTab,
+        range: deps.currentRange()
+      }, true);
+      cb.onStateChange();
+    }
     async function handleDbSelectChange() {
       const dbId = dbSelect.value;
       if (!dbId)
@@ -12939,13 +13081,15 @@ ${frontmatter.yaml}
         sizeBytes: file?.sizeBytes || 0,
         kind: file?.kind || "sqlite"
       };
+      currentSchema = null;
       clearDockerNotice();
-      await selectDb(dbId, undefined, generation);
+      await selectDb(dbId, undefined, generation, null);
       if (generation !== loadGeneration || currentDbInfo?.id !== dbId)
         return;
       deps.setRoute({
         screen: "database",
         db: dbId,
+        schema: currentSchema ?? undefined,
         table: currentTable ?? undefined,
         tab: currentTab === "data" ? undefined : currentTab,
         range: deps.currentRange()
@@ -12954,7 +13098,7 @@ ${frontmatter.yaml}
     }
     let pendingRedisInitial = initial.redis;
     let pendingEsInitial = initial.es;
-    async function enter(db, table2, view, options = {}) {
+    async function enter(db, schema, table2, view, options = {}) {
       const generation = ++loadGeneration;
       const filesResponse = await fetchDbFiles();
       if (generation !== loadGeneration)
@@ -12992,8 +13136,10 @@ ${frontmatter.yaml}
       if (!db && !autoSelectFirst) {
         dbSelect.value = "";
         currentDbInfo = null;
+        currentSchema = null;
         currentTable = null;
         schemaCache = null;
+        renderSchemaOptions([], null);
         tableList.render([]);
         grid.clear();
         schemaView.clear();
@@ -13013,7 +13159,7 @@ ${frontmatter.yaml}
       };
       pendingRedisInitial = undefined;
       pendingEsInitial = undefined;
-      await selectDb(target, explorerInitial, generation, table2);
+      await selectDb(target, explorerInitial, generation, schema !== undefined ? schema : currentSchema, table2);
       if (generation !== loadGeneration || currentDbInfo?.id !== target)
         return;
       if (currentDbInfo?.kind === "redis" || currentDbInfo?.kind === "elasticsearch") {
@@ -13046,6 +13192,8 @@ ${frontmatter.yaml}
     function applyAnnotationTarget(target) {
       if (!target || target.db !== currentDbInfo?.id)
         return;
+      if (target.schema && target.schema !== currentSchema)
+        return;
       if (target.data) {
         if (target.table && target.table !== currentTable)
           return;
@@ -13082,6 +13230,7 @@ ${frontmatter.yaml}
       const state = {
         id: cb.tabId,
         dbId: currentDbInfo?.id ?? null,
+        schema: currentSchema,
         table: currentTable ?? activeTable?.dataset.table ?? null,
         view: currentTab
       };
@@ -13113,6 +13262,7 @@ ${frontmatter.yaml}
       const target = {
         kind: "database",
         db: currentDbInfo.id,
+        ...currentSchema ? { schema: currentSchema } : {},
         ...currentTable ? { table: currentTable } : {},
         tab: currentTab
       };
@@ -13129,12 +13279,14 @@ ${frontmatter.yaml}
     function getLabel() {
       if (!currentDbInfo)
         return labelFromDbId(initial.dbId);
+      const suffix = currentSchema ? ` / ${currentSchema}` : "";
       if (currentDbInfo.id.startsWith("docker:")) {
         const m = currentDbInfo.name.match(/^(\S+)/);
-        return m ? m[1] : currentDbInfo.name;
+        return `${m ? m[1] : currentDbInfo.name}${suffix}`;
       }
       const lastSlash = currentDbInfo.path.lastIndexOf("/");
-      return lastSlash >= 0 ? currentDbInfo.path.slice(lastSlash + 1) : currentDbInfo.path;
+      const label = lastSlash >= 0 ? currentDbInfo.path.slice(lastSlash + 1) : currentDbInfo.path;
+      return `${label}${suffix}`;
     }
     function dispose() {
       loadGeneration++;
@@ -13149,6 +13301,7 @@ ${frontmatter.yaml}
       redisExplorer.dispose();
       esExplorer.dispose();
       currentDbInfo = null;
+      currentSchema = null;
       currentTable = null;
       schemaCache = null;
     }
@@ -13294,6 +13447,7 @@ ${frontmatter.yaml}
       deps.setRoute({
         screen: "database",
         db: s2.dbId ?? undefined,
+        schema: s2.schema ?? undefined,
         table: s2.table ?? undefined,
         tab: s2.view === "data" ? undefined : s2.view,
         range: deps.currentRange()
@@ -13314,6 +13468,7 @@ ${frontmatter.yaml}
       for (const tab of tabs) {
         const key = JSON.stringify({
           dbId: tab.dbId,
+          schema: tab.schema ?? null,
           table: tab.table,
           view: tab.view,
           redis: tab.redis ?? null,
@@ -13544,6 +13699,7 @@ ${frontmatter.yaml}
         }
       }, {
         dbId: initial?.dbId ?? null,
+        schema: initial?.schema ?? null,
         table: initial?.table ?? null,
         view: initial?.view ?? undefined,
         sqlDraft: initial?.sqlDraft,
@@ -13572,7 +13728,7 @@ ${frontmatter.yaml}
         if (options.annotationTarget)
           restoring = true;
         try {
-          await pane.enter(initial?.dbId || undefined, initial?.table || undefined, initial?.view || undefined, options);
+          await pane.enter(initial?.dbId || undefined, initial?.schema || undefined, initial?.table || undefined, initial?.view || undefined, options);
           refreshChipLabel(id);
         } finally {
           if (options.annotationTarget)
@@ -13609,35 +13765,41 @@ ${frontmatter.yaml}
     newTabBtn.addEventListener("click", () => {
       openTab({ dbId: null, table: null, view: "data" }, { autoSelectFirst: false });
     });
-    function routeMatchesState(state, db, table2, view) {
-      if (!db && (table2 || view) && !state.dbId)
+    function routeMatchesState(state, db, schema, table2, view) {
+      if (!db && (schema || table2 || view) && !state.dbId)
         return false;
       if (db !== undefined && state.dbId !== db)
         return false;
+      if (schema !== undefined) {
+        const routeSchema = schema || "public";
+        const stateSchema = state.schema || "public";
+        if (stateSchema !== routeSchema)
+          return false;
+      }
       if (table2 !== undefined && state.table !== table2)
         return false;
       if (view !== undefined && state.view !== view)
         return false;
       return true;
     }
-    async function applyRouteToTab(db, table2, view, options = {}) {
-      async function enterPane(pane, targetDb, targetTable, targetView, enterOptions) {
+    async function applyRouteToTab(db, schema, table2, view, options = {}) {
+      async function enterPane(pane, targetDb, targetSchema, targetTable, targetView, enterOptions) {
         if (!enterOptions?.annotationTarget) {
-          await pane.enter(targetDb, targetTable, targetView, enterOptions);
+          await pane.enter(targetDb, targetSchema, targetTable, targetView, enterOptions);
           return;
         }
         restoring = true;
         try {
-          await pane.enter(targetDb, targetTable, targetView, enterOptions);
+          await pane.enter(targetDb, targetSchema, targetTable, targetView, enterOptions);
         } finally {
           restoring = false;
         }
       }
       for (const [id2, entry] of tabsById) {
-        if (routeMatchesState(entry.pane.getState(), db, table2, view)) {
+        if (routeMatchesState(entry.pane.getState(), db, schema, table2, view)) {
           setActive(id2);
           if (options.annotationTarget) {
-            await enterPane(entry.pane, db, table2, view, options);
+            await enterPane(entry.pane, db, schema, table2, view, options);
             if (!mounted)
               return;
           }
@@ -13649,7 +13811,7 @@ ${frontmatter.yaml}
         const targetId = activeTabId;
         const active = tabsById.get(activeTabId);
         if (active) {
-          await enterPane(active.pane, db, table2, view, options);
+          await enterPane(active.pane, db, schema, table2, view, options);
           if (!mounted)
             return;
           refreshChipLabel(targetId);
@@ -13658,6 +13820,7 @@ ${frontmatter.yaml}
       }
       const id = openTab({
         dbId: db ?? null,
+        schema: schema ?? null,
         table: table2 ?? null,
         view: view ?? "data"
       }, { autoSelectFirst: db === undefined, ...options });
@@ -13676,7 +13839,17 @@ ${frontmatter.yaml}
         return null;
       }
     }
-    async function doEnter(seq, db, table2, view, options = {}) {
+    function parseSseSchema(data) {
+      if (!data)
+        return null;
+      try {
+        const parsed = JSON.parse(data);
+        return typeof parsed.schema === "string" ? parsed.schema : null;
+      } catch {
+        return null;
+      }
+    }
+    async function doEnter(seq, db, schema, table2, view, options = {}) {
       if (seq !== lifecycleSeq)
         return;
       const firstMount = !mounted;
@@ -13739,8 +13912,8 @@ ${frontmatter.yaml}
           } finally {
             restoring = false;
           }
-          if (db || table2 || view) {
-            await applyRouteToTab(db, table2, view, {
+          if (db || schema || table2 || view) {
+            await applyRouteToTab(db, schema ?? null, table2, view, {
               ...options,
               reuseActiveTab: options.reuseActiveTab ?? true
             });
@@ -13765,6 +13938,7 @@ ${frontmatter.yaml}
       if (tabsById.size === 0) {
         const id = openTab({
           dbId: db || null,
+          schema: schema || null,
           table: table2 || null,
           view: view || "data"
         }, { autoSelectFirst: !db, ...options });
@@ -13780,8 +13954,8 @@ ${frontmatter.yaml}
       const active = tabsById.get(activeTabId);
       if (!active)
         return;
-      if (db || table2 || view) {
-        await applyRouteToTab(db, table2, view, {
+      if (db || schema || table2 || view) {
+        await applyRouteToTab(db, schema ?? null, table2, view, {
           ...options,
           reuseActiveTab: options.reuseActiveTab ?? true
         });
@@ -13789,9 +13963,9 @@ ${frontmatter.yaml}
         syncActiveRoute();
       }
     }
-    async function enter(db, table2, view, options = {}) {
+    async function enter(db, schema, table2, view, options = {}) {
       const seq = lifecycleSeq;
-      enterQueue = enterQueue.catch(() => {}).then(() => doEnter(seq, db, table2, view, options));
+      enterQueue = enterQueue.catch(() => {}).then(() => doEnter(seq, db, schema, table2, view, options));
       await enterQueue;
     }
     function leave() {
@@ -13841,8 +14015,12 @@ ${frontmatter.yaml}
       if (!mounted)
         return;
       const dbId = parseSseDbId(data);
+      const schema = parseSseSchema(data);
       for (const [, entry] of tabsById) {
-        if (dbId && entry.pane.getState().dbId !== dbId)
+        const state = entry.pane.getState();
+        if (dbId && state.dbId !== dbId)
+          continue;
+        if (schema && state.schema !== schema)
           continue;
         entry.pane.handleSse(event, data);
       }
@@ -23784,7 +23962,7 @@ code-viewer annotate add-db --db app.db --tab query \\
         return Promise.resolve(null);
       }
       if (STATE.route.screen === "database") {
-        DATABASE_VIEW.enter(STATE.route.db, STATE.route.table, STATE.route.tab).then(() => ANNOTATIONS_UI?.applyInlineAnnotations());
+        DATABASE_VIEW.enter(STATE.route.db, STATE.route.schema, STATE.route.table, STATE.route.tab).then(() => ANNOTATIONS_UI?.applyInlineAnnotations());
         setStatus("live");
         return Promise.resolve(null);
       }
@@ -23855,7 +24033,7 @@ code-viewer annotate add-db --db app.db --tab query \\
         HISTORY_VIEW.enterHistory();
       } else if (STATE.route.screen === "database") {
         setStatus("live");
-        DATABASE_VIEW.enter(STATE.route.db, STATE.route.table, STATE.route.tab).then(() => ANNOTATIONS_UI?.applyInlineAnnotations());
+        DATABASE_VIEW.enter(STATE.route.db, STATE.route.schema, STATE.route.table, STATE.route.tab).then(() => ANNOTATIONS_UI?.applyInlineAnnotations());
       } else
         load();
       syncLineRefPill();
@@ -24005,7 +24183,7 @@ code-viewer annotate add-db --db app.db --tab query \\
         cancelActiveSourceLoad("navigation");
         setPageMode();
         removeStandaloneSource();
-        DATABASE_VIEW.enter(STATE.route.db, STATE.route.table, STATE.route.tab).then(() => ANNOTATIONS_UI?.applyInlineAnnotations());
+        DATABASE_VIEW.enter(STATE.route.db, STATE.route.schema, STATE.route.table, STATE.route.tab).then(() => ANNOTATIONS_UI?.applyInlineAnnotations());
         setStatus("live");
         return;
       }
@@ -24123,7 +24301,7 @@ code-viewer annotate add-db --db app.db --tab query \\
       },
       openDatabaseAnnotation: (target) => {
         setStatus("live");
-        return DATABASE_VIEW.enter(target.db, target.table, target.tab, {
+        return DATABASE_VIEW.enter(target.db, target.schema, target.table, target.tab, {
           annotationTarget: target,
           reuseActiveTab: true
         });