@marimo-team/frontend 0.23.15-dev57 → 0.23.15-dev59

package/dist/index.html

@@ -66,7 +66,7 @@
     <marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
     <!-- /TODO -->
     <title>{{ title }}</title>
-    <script type="module" crossorigin src="./assets/index-IjEu8MdT.js"></script>
+    <script type="module" crossorigin src="./assets/index-C0JtPo0J.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/preload-helper-TXkS1QI3.js">
     <link rel="modulepreload" crossorigin href="./assets/objects-BlG0ZrO0.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-LvLJmgfZ.js">
@@ -110,10 +110,10 @@
     <link rel="modulepreload" crossorigin href="./assets/useLifecycle-lLOBhc-1.js">
     <link rel="modulepreload" crossorigin href="./assets/useNonce-CbdaHKzX.js">
     <link rel="modulepreload" crossorigin href="./assets/useTheme-KXqAyDPC.js">
-    <link rel="modulepreload" crossorigin href="./assets/arrays-DAC2orgH.js">
+    <link rel="modulepreload" crossorigin href="./assets/arrays-DbOq36rN.js">
     <link rel="modulepreload" crossorigin href="./assets/strings-Djnbwmfl.js">
-    <link rel="modulepreload" crossorigin href="./assets/once-hq2TLzOp.js">
-    <link rel="modulepreload" crossorigin href="./assets/capabilities-BrCoB8Nv.js">
+    <link rel="modulepreload" crossorigin href="./assets/once-CGKw_kwj.js">
+    <link rel="modulepreload" crossorigin href="./assets/capabilities-B09j1Eor.js">
     <link rel="modulepreload" crossorigin href="./assets/createReducer-C7kZ8zEe.js">
     <link rel="modulepreload" crossorigin href="./assets/paths-BKO-pHK6.js">
     <link rel="modulepreload" crossorigin href="./assets/dist-12S8I4CH.js">
@@ -134,55 +134,55 @@
     <link rel="modulepreload" crossorigin href="./assets/debounce-OiXznToA.js">
     <link rel="modulepreload" crossorigin href="./assets/database-zap-CKO8g4BU.js">
     <link rel="modulepreload" crossorigin href="./assets/main-BNL5rxQw.js">
-    <link rel="modulepreload" crossorigin href="./assets/cells-CGB7BI8E.js">
+    <link rel="modulepreload" crossorigin href="./assets/cells-Cf7bHHq3.js">
     <link rel="modulepreload" crossorigin href="./assets/kbd-C5HnBH5U.js">
     <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-BRbUAUFn.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-dialog-BXegNC0I.js">
     <link rel="modulepreload" crossorigin href="./assets/dialog-D1DEsRZ2.js">
     <link rel="modulepreload" crossorigin href="./assets/useDebounce-JDKr83KO.js">
-    <link rel="modulepreload" crossorigin href="./assets/numbers-tWPkOv8y.js">
+    <link rel="modulepreload" crossorigin href="./assets/numbers-CeeaFKqu.js">
     <link rel="modulepreload" crossorigin href="./assets/SSRProvider-BUSmWJKC.js">
     <link rel="modulepreload" crossorigin href="./assets/context-BFPaAUK_.js">
     <link rel="modulepreload" crossorigin href="./assets/useNumberFormatter-4-Qvf4uR.js">
     <link rel="modulepreload" crossorigin href="./assets/usePress-5hBv4sjD.js">
-    <link rel="modulepreload" crossorigin href="./assets/input-8mGjyjCm.js">
-    <link rel="modulepreload" crossorigin href="./assets/ImperativeModal-CdbfMDGY.js">
-    <link rel="modulepreload" crossorigin href="./assets/cell-link-racjLlk3.js">
+    <link rel="modulepreload" crossorigin href="./assets/input-CqrUjynb.js">
+    <link rel="modulepreload" crossorigin href="./assets/ImperativeModal-BIavOiUv.js">
+    <link rel="modulepreload" crossorigin href="./assets/cell-link-DqBkyAFe.js">
     <link rel="modulepreload" crossorigin href="./assets/config-COUOIPEq.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-jlwhGxSb.js">
     <link rel="modulepreload" crossorigin href="./assets/chevron-right-BS_NcSch.js">
     <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-BFZLnWeO.js">
     <link rel="modulepreload" crossorigin href="./assets/links-wcQA1Np1.js">
-    <link rel="modulepreload" crossorigin href="./assets/useRunCells-DInLf7VK.js">
+    <link rel="modulepreload" crossorigin href="./assets/useRunCells-CSSF_mJ0.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-BtTOqPTS.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-3iHFdt22.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-icon-C2pG0ZNK.js">
-    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-TA_Yn7VT.js">
-    <link rel="modulepreload" crossorigin href="./assets/datasource-D4MmVTwE.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-CX463CMn.js">
+    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-BCvU9dYz.js">
+    <link rel="modulepreload" crossorigin href="./assets/datasource-ySAiC9gr.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-DBzEQtWz.js">
     <link rel="modulepreload" crossorigin href="./assets/hat-glasses-BttHlyvs.js">
     <link rel="modulepreload" crossorigin href="./assets/package-Bxz_8e44.js">
     <link rel="modulepreload" crossorigin href="./assets/sparkles-DUCpRFlS.js">
-    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-BSqq5K8X.js">
+    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-DO2k2fA5.js">
     <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-C7_5jjWi.js">
     <link rel="modulepreload" crossorigin href="./assets/eye-off-BOZA7gbn.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-cw-CYq4mK5a.js">
-    <link rel="modulepreload" crossorigin href="./assets/tree-actions-Cx_hxuVi.js">
+    <link rel="modulepreload" crossorigin href="./assets/tree-actions-CsC2XmGo.js">
     <link rel="modulepreload" crossorigin href="./assets/spinner-D-V4psAa.js">
-    <link rel="modulepreload" crossorigin href="./assets/html-to-image-DVl8_FaD.js">
-    <link rel="modulepreload" crossorigin href="./assets/focus-yka11DM2.js">
+    <link rel="modulepreload" crossorigin href="./assets/html-to-image-CwmX28T9.js">
+    <link rel="modulepreload" crossorigin href="./assets/focus-DiEyfiAG.js">
     <link rel="modulepreload" crossorigin href="./assets/useAsyncData-Bg5iAViP.js">
     <link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-sVm_hz8A.js">
     <link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-Dx_STMJD.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-Cp0LZT-a.js">
-    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-FYK9tLPx.js">
-    <link rel="modulepreload" crossorigin href="./assets/command-C_1t09X7.js">
-    <link rel="modulepreload" crossorigin href="./assets/field-Zn_0QxNm.js">
+    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-QvXG0CRk.js">
+    <link rel="modulepreload" crossorigin href="./assets/command-CAJLPEBq.js">
+    <link rel="modulepreload" crossorigin href="./assets/field-BeZbVzXA.js">
     <link rel="modulepreload" crossorigin href="./assets/popover-DrHQ3KEt.js">
     <link rel="modulepreload" crossorigin href="./assets/errors-PgHhDa-M.js">
-    <link rel="modulepreload" crossorigin href="./assets/download-CzUYSR2C.js">
+    <link rel="modulepreload" crossorigin href="./assets/download-BomYt3nl.js">
     <link rel="modulepreload" crossorigin href="./assets/table-CH2plyy9.js">
-    <link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-4oW1xKBS.js">
+    <link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-Ccb4fvKc.js">
     <link rel="modulepreload" crossorigin href="./assets/error-banner-B6eIlxzg.js">
     <link rel="modulepreload" crossorigin href="./assets/formats-ClEFGPy-.js">
     <link rel="modulepreload" crossorigin href="./assets/utils-CCTAhdFi.js">
@@ -193,7 +193,7 @@
     <link rel="modulepreload" crossorigin href="./assets/emotion-is-prop-valid.esm-lG8j6oqk.js">
     <link rel="modulepreload" crossorigin href="./assets/useDateFormatter-rtpVEy3J.js">
     <link rel="modulepreload" crossorigin href="./assets/react-icons.esm-D4GMDkIf.js">
-    <link rel="modulepreload" crossorigin href="./assets/RSPContexts-Dim_f45V.js">
+    <link rel="modulepreload" crossorigin href="./assets/RSPContexts-CgC81f0I.js">
     <link rel="modulepreload" crossorigin href="./assets/table-D-tcnZC7.js">
     <link rel="modulepreload" crossorigin href="./assets/ellipsis-C_B8Ux9M.js">
     <link rel="modulepreload" crossorigin href="./assets/external-link-BOlXZUla.js">
@@ -201,33 +201,33 @@
     <link rel="modulepreload" crossorigin href="./assets/plus-AgXtozBz.js">
     <link rel="modulepreload" crossorigin href="./assets/trash-2-72W0TZ3L.js">
     <link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-Z-MD3n3J.js">
-    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-DYot1XH7.js">
+    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-DnGSkLeP.js">
     <link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-iDRxid4h.js">
     <link rel="modulepreload" crossorigin href="./assets/square-function-DNNRTPQJ.js">
     <link rel="modulepreload" crossorigin href="./assets/spec-CzqcmYQk.js">
-    <link rel="modulepreload" crossorigin href="./assets/column-preview-DWh6-GnT.js">
+    <link rel="modulepreload" crossorigin href="./assets/column-preview-BgZLUEOj.js">
     <link rel="modulepreload" crossorigin href="./assets/icons-CIPE8AIY.js">
-    <link rel="modulepreload" crossorigin href="./assets/radio-group-BSy8AVfH.js">
-    <link rel="modulepreload" crossorigin href="./assets/floating-outline-CVHJWCrl.js">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-CLBjGkt5.js">
+    <link rel="modulepreload" crossorigin href="./assets/floating-outline-wz-WSRgP.js">
     <link rel="modulepreload" crossorigin href="./assets/switch-CvweaCXq.js">
     <link rel="modulepreload" crossorigin href="./assets/objectWithoutPropertiesLoose-CboCOq4o.js">
     <link rel="modulepreload" crossorigin href="./assets/esm-BL7jQmzn.js">
-    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-CYmNS4w1.js">
+    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-CW_G5e4E.js">
     <link rel="modulepreload" crossorigin href="./assets/file-headphone-DAu6VO6j.js">
     <link rel="modulepreload" crossorigin href="./assets/file-CJH9JNGH.js">
     <link rel="modulepreload" crossorigin href="./assets/image-5XI2VU-q.js">
-    <link rel="modulepreload" crossorigin href="./assets/file-icons-AyJaRx5i.js">
+    <link rel="modulepreload" crossorigin href="./assets/file-icons-Cb54mIL8.js">
     <link rel="modulepreload" crossorigin href="./assets/events-90X9nql5.js">
     <link rel="modulepreload" crossorigin href="./assets/share-CYpcX4N4.js">
     <link rel="modulepreload" crossorigin href="./assets/blob-C3EfaMOb.js">
     <link rel="modulepreload" crossorigin href="./assets/memoize-Tp7rARFe.js">
     <link rel="modulepreload" crossorigin href="./assets/get-C-qh_et5.js">
     <link rel="modulepreload" crossorigin href="./assets/_baseSet-CsW0tABf.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-BFNCz9xr.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-BXbiRXZk.js">
     <link rel="modulepreload" crossorigin href="./assets/label-BElwWzf0.js">
-    <link rel="modulepreload" crossorigin href="./assets/textarea-BXl7Wvbv.js">
+    <link rel="modulepreload" crossorigin href="./assets/textarea-CpFfEUet.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-ccw-sLaKP2vj.js">
-    <link rel="modulepreload" crossorigin href="./assets/form-DpxiqxQM.js">
+    <link rel="modulepreload" crossorigin href="./assets/form-CgWNb44_.js">
     <link rel="modulepreload" crossorigin href="./assets/renderShortcut-BZLr8D7H.js">
     <link rel="modulepreload" crossorigin href="./assets/useBoolean-0INKlLC_.js">
     <link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-CSMoa-ga.js">
@@ -249,7 +249,7 @@
     <link rel="stylesheet" crossorigin href="./assets/cells-BVzo2MHf.css">
     <link rel="stylesheet" crossorigin href="./assets/markdown-renderer-DdDKmWlR.css">
     <link rel="stylesheet" crossorigin href="./assets/JsonOutput-BQtz7-np.css">
-    <link rel="stylesheet" crossorigin href="./assets/index-D6ap9wBK.css">
+    <link rel="stylesheet" crossorigin href="./assets/index-BjlEpvLC.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/frontend",
-  "version": "0.23.15-dev57",
+  "version": "0.23.15-dev59",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/editor/chrome/panels/write-secret-modal.tsx

@@ -43,10 +43,11 @@ export const WriteSecretModal: React.FC<{
   providerNames: string[];
   onClose: () => void;
   onSuccess: (secretName: string) => void;
-}> = ({ providerNames, onClose, onSuccess }) => {
+  initialValue?: string;
+}> = ({ providerNames, onClose, onSuccess, initialValue }) => {
   const { writeSecret } = useRequestClient();
   const [key, setKey] = React.useState("");
-  const [value, setValue] = React.useState("");
+  const [value, setValue] = React.useState(initialValue || "");
   const [location, setLocation] = React.useState<string | undefined>(
     providerNames[0],
   );

package/src/components/editor/connections/__tests__/secret-combobox.test.ts

@@ -0,0 +1,134 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+import { describe, expect, test } from "vitest";
+import { partitionSecretKeys } from "../secret-combobox";
+
+describe("partitionSecretKeys", () => {
+  const keys = [
+    "HOSTNAME",
+    "PGHOST",
+    "DB_HOST",
+    "KUBERNETES_SERVICE_HOST",
+    "GPG_KEY",
+    "HOME",
+    "POSTGRES_PASSWORD",
+    "DB_PASSWORD",
+    "USERNAME",
+    "PGUSER",
+    "USER_AGENT",
+    "AWS_ACCESS_KEY_ID",
+    "AWS_SECRET_ACCESS_KEY",
+    "AWS_SESSION_TOKEN",
+    "OBJECT_STORAGE_KEY",
+    "OBJECT_STORAGE_SECRET",
+    "DATABASE_URL",
+    "SNOWFLAKE_PRIVATE_KEY_PASSPHRASE",
+    "PATH",
+    "GITHUB_PAT",
+  ];
+
+  test("returns all keys as other when regex is empty", () => {
+    expect(partitionSecretKeys(keys, "")).toEqual({
+      recommended: [],
+      other: keys,
+    });
+  });
+
+  test("handles invalid regex", () => {
+    expect(partitionSecretKeys(keys, "[invalid")).toEqual({
+      recommended: [],
+      other: keys,
+    });
+  });
+
+  test("recommends host-like keys and excludes kubernetes", () => {
+    const hostRegex =
+      "^(?!.*(kubernetes|gpg)).*(host(name)?|pghost|db.?host|database.?host|mysql.?host|postgres.?host|server.?host)";
+    const { recommended, other } = partitionSecretKeys(keys, hostRegex);
+
+    expect(recommended).toEqual(["HOSTNAME", "PGHOST", "DB_HOST"]);
+    expect(other).toContain("KUBERNETES_SERVICE_HOST");
+    expect(other).toContain("GPG_KEY");
+    expect(other).toContain("HOME");
+  });
+
+  test("recommends password-like keys", () => {
+    const { recommended } = partitionSecretKeys(
+      keys,
+      "(password|passwd|pgpassword|db.?pass(word)?)",
+    );
+    expect(recommended).toEqual(["POSTGRES_PASSWORD", "DB_PASSWORD"]);
+  });
+
+  test("recommends username keys without matching USER_AGENT", () => {
+    const { recommended } = partitionSecretKeys(
+      keys,
+      "(username|pguser|db.?user|^USER$|_USER$)",
+    );
+    expect(recommended).toEqual(["USERNAME", "PGUSER"]);
+    expect(recommended).not.toContain("USER_AGENT");
+  });
+
+  test("recommends aws access key id without matching the secret key", () => {
+    const { recommended } = partitionSecretKeys(
+      keys,
+      "(access.?key.?id|aws.?access.?key)",
+    );
+    expect(recommended).toEqual(["AWS_ACCESS_KEY_ID"]);
+  });
+
+  test("recommends aws secret access key", () => {
+    const { recommended } = partitionSecretKeys(
+      keys,
+      "(secret.?access.?key|aws.?secret)",
+    );
+    expect(recommended).toEqual(["AWS_SECRET_ACCESS_KEY"]);
+  });
+
+  test("recommends aws session token", () => {
+    const { recommended } = partitionSecretKeys(
+      keys,
+      "(session.?token|aws.?session)",
+    );
+    expect(recommended).toEqual(["AWS_SESSION_TOKEN"]);
+  });
+
+  test("recommends object storage credentials", () => {
+    expect(
+      partitionSecretKeys(
+        keys,
+        "(access.?key.?id|object.?storage.?key|aws.?access.?key)",
+      ).recommended,
+    ).toEqual(["AWS_ACCESS_KEY_ID", "OBJECT_STORAGE_KEY"]);
+    expect(
+      partitionSecretKeys(
+        keys,
+        "(secret.?access.?key|object.?storage.?secret|aws.?secret)",
+      ).recommended,
+    ).toEqual(["AWS_SECRET_ACCESS_KEY", "OBJECT_STORAGE_SECRET"]);
+  });
+
+  test("recommends uri/url-like keys", () => {
+    const { recommended } = partitionSecretKeys(
+      keys,
+      "(uri|url|connection.?string|database.?url|jdbc)",
+    );
+    expect(recommended).toEqual(["DATABASE_URL"]);
+  });
+
+  test("recommends token keys and bounds PAT so PATH is excluded", () => {
+    const { recommended, other } = partitionSecretKeys(
+      keys,
+      "(token|api.?key|access.?token|auth.?token|(^|_)pat(_|$))",
+    );
+    expect(recommended).toEqual(["AWS_SESSION_TOKEN", "GITHUB_PAT"]);
+    expect(other).toContain("PATH");
+  });
+
+  test("recommends passphrase keys", () => {
+    const { recommended } = partitionSecretKeys(
+      keys,
+      "(passphrase|private.?key.?passphrase|key.?passphrase)",
+    );
+    expect(recommended).toEqual(["SNOWFLAKE_PRIVATE_KEY_PASSPHRASE"]);
+  });
+});

package/src/components/editor/connections/database/schemas.ts

@@ -10,8 +10,7 @@ function passwordField() {
       FieldOptions.of({
         label: "Password",
         inputType: "password",
-        placeholder: "password",
-        optionRegex: ".*password.*",
+        optionRegex: "(password|passwd|pgpassword|db.?pass(word)?)",
       }),
     );
 }
@@ -24,8 +23,7 @@ function tokenField(label?: string, required?: boolean) {
     FieldOptions.of({
       label: label || "Token",
       inputType: "password",
-      placeholder: "token",
-      optionRegex: ".*token.*",
+      optionRegex: "(token|api.?key|access.?token|auth.?token|(^|_)pat(_|$))",
     }),
   );
   return field;
@@ -38,8 +36,7 @@ function warehouseNameField() {
     .describe(
       FieldOptions.of({
         label: "Warehouse Name",
-        placeholder: "warehouse",
-        optionRegex: ".*warehouse.*",
+        optionRegex: "(warehouse|snowflake.?warehouse)",
       }),
     );
 }
@@ -49,7 +46,10 @@ function uriField(label?: string, required?: boolean) {
   field = required ? field.nonempty() : field.optional();
 
   return field.describe(
-    FieldOptions.of({ label: label || "URI", optionRegex: ".*uri.*" }),
+    FieldOptions.of({
+      label: label || "URI",
+      optionRegex: "(uri|url|connection.?string|database.?url|jdbc)",
+    }),
   );
 }
 
@@ -60,8 +60,9 @@ function hostField(label?: string) {
     .describe(
       FieldOptions.of({
         label: label || "Host",
-        placeholder: "localhost",
-        optionRegex: ".*host.*",
+        // Exclude kubernetes/system host vars that match a naive "host" search.
+        optionRegex:
+          "^(?!.*(kubernetes|gpg)).*(host(name)?|pghost|db.?host|database.?host|mysql.?host|postgres.?host|server.?host)",
       }),
     );
 }
@@ -70,8 +71,7 @@ function databaseField() {
   return z.string().describe(
     FieldOptions.of({
       label: "Database",
-      placeholder: "db name",
-      optionRegex: ".*database.*",
+      optionRegex: "(database|db.?name|pgdatabase|^DB$|^DATABASE$)",
     }),
   );
 }
@@ -80,8 +80,7 @@ function schemaField() {
   return z.string().describe(
     FieldOptions.of({
       label: "Schema",
-      placeholder: "schema name",
-      optionRegex: ".*schema.*",
+      optionRegex: "(^SCHEMA$|db.?schema|postgres.?schema|pg.?schema|_SCHEMA$)",
     }),
   );
 }
@@ -93,8 +92,7 @@ function usernameField() {
     .describe(
       FieldOptions.of({
         label: "Username",
-        placeholder: "username",
-        optionRegex: ".*username.*",
+        optionRegex: "(username|pguser|db.?user|^USER$|_USER$)",
       }),
     );
 }
@@ -196,7 +194,7 @@ export const SnowflakeConnectionSchema = z
       .describe(
         FieldOptions.of({
           label: "Account",
-          optionRegex: ".*snowflake.*",
+          optionRegex: "(snowflake.?account|^SNOWFLAKE_ACCOUNT$|account.?id)",
         }),
       ),
     warehouse: z
@@ -205,7 +203,7 @@ export const SnowflakeConnectionSchema = z
       .describe(
         FieldOptions.of({
           label: "Warehouse",
-          optionRegex: ".*snowflake.*",
+          optionRegex: "(snowflake.?warehouse|warehouse)",
         }),
       ),
     database: databaseField(),
@@ -215,7 +213,7 @@ export const SnowflakeConnectionSchema = z
       .describe(
         FieldOptions.of({
           label: "Schema",
-          optionRegex: ".*snowflake.*",
+          optionRegex: "(snowflake.?schema|^SCHEMA$|_SCHEMA$)",
         }),
       ),
     role: z
@@ -256,7 +254,8 @@ export const SnowflakeConnectionSchema = z
               FieldOptions.of({
                 label: "Private Key Passphrase",
                 inputType: "password",
-                optionRegex: ".*passphrase.*",
+                optionRegex:
+                  "(passphrase|private.?key.?passphrase|key.?passphrase)",
               }),
             ),
         }),
@@ -283,7 +282,8 @@ export const BigQueryConnectionSchema = z
       .describe(
         FieldOptions.of({
           label: "Project ID",
-          optionRegex: ".*bigquery.*",
+          optionRegex:
+            "(bigquery.?project|gcp.?project|google.?cloud.?project|project.?id)",
         }),
       ),
     dataset: z
@@ -292,7 +292,7 @@ export const BigQueryConnectionSchema = z
       .describe(
         FieldOptions.of({
           label: "Dataset",
-          optionRegex: ".*bigquery.*",
+          optionRegex: "(bigquery.?dataset|dataset)",
         }),
       ),
     credentials_json: z
@@ -377,7 +377,7 @@ export const IcebergConnectionSchema = z.object({
             FieldOptions.of({
               label: "URI",
               placeholder: "https://",
-              optionRegex: ".*uri.*",
+              optionRegex: "(uri|url|connection.?string|database.?url|jdbc)",
             }),
           ),
         token: tokenField(),
@@ -392,7 +392,7 @@ export const IcebergConnectionSchema = z.object({
             FieldOptions.of({
               label: "URI",
               placeholder: "jdbc:iceberg://host:port/database",
-              optionRegex: ".*uri.*",
+              optionRegex: "(uri|url|connection.?string|database.?url|jdbc)",
             }),
           ),
       }),
@@ -419,7 +419,13 @@ export const IcebergConnectionSchema = z.object({
         "dynamodb.access-key-id": z
           .string()
           .optional()
-          .describe(FieldOptions.of({ label: "Access Key ID" })),
+          .describe(
+            FieldOptions.of({
+              label: "Access Key ID",
+              inputType: "password",
+              optionRegex: "(access.?key.?id|aws.?access.?key)",
+            }),
+          ),
         "dynamodb.secret-access-key": z
           .string()
           .optional()
@@ -427,6 +433,7 @@ export const IcebergConnectionSchema = z.object({
             FieldOptions.of({
               label: "Secret Access Key",
               inputType: "password",
+              optionRegex: "(secret.?access.?key|aws.?secret)",
             }),
           ),
         "dynamodb.session-token": z
@@ -436,6 +443,7 @@ export const IcebergConnectionSchema = z.object({
             FieldOptions.of({
               label: "Session Token",
               inputType: "password",
+              optionRegex: "(session.?token|aws.?session)",
             }),
           ),
       }),
@@ -484,7 +492,7 @@ export const RedshiftConnectionSchema = z
               FieldOptions.of({
                 label: "AWS Access Key ID",
                 inputType: "password",
-                optionRegex: ".*aws_access_key_id.*",
+                optionRegex: "(access.?key.?id|aws.?access.?key)",
               }),
             ),
           aws_secret_access_key: z
@@ -494,7 +502,7 @@ export const RedshiftConnectionSchema = z
               FieldOptions.of({
                 label: "AWS Secret Access Key",
                 inputType: "password",
-                optionRegex: ".*aws_secret_access_key.*",
+                optionRegex: "(secret.?access.?key|aws.?secret)",
               }),
             ),
           aws_session_token: z
@@ -504,7 +512,7 @@ export const RedshiftConnectionSchema = z
               FieldOptions.of({
                 label: "AWS Session Token",
                 inputType: "password",
-                optionRegex: ".*aws_session_token.*",
+                optionRegex: "(session.?token|aws.?session)",
               }),
             ),
         }),