Merge remote-tracking branch 'origin/main' into configmap-scoped-system-parameters

Author: github-actions[bot]

LICENSE

@@ -13,7 +13,7 @@ Business Source License 1.1
 
 Licensor:                  Materialize, Inc.
 
-Licensed Work:             Materialize Version 20260821
+Licensed Work:             Materialize Version 20260824
                            The Licensed Work is © 2026 Materialize, Inc.
 
 Additional Use Grant:      Within a single installation of the Licensed Work,
@@ -39,7 +39,7 @@ Additional Use Grant:      Within a single installation of the Licensed Work,
                            whose definitions are controlled by such third
                            parties.
 
-Change Date:               August 21, 2030
+Change Date:               August 24, 2030
 
 Change License:            Apache License, Version 2.0
 

bin/clear-corrupted-cargo-target-dir

@@ -27,12 +27,29 @@ incremental_build_failure_pattern+="|signal: 11, SIGSEGV"
 
 registry_fetch_failure_pattern="unable to update registry"
 
+# A cached build-script binary poisoned by cargo cache corruption dies with a
+# bare ENOENT before doing any work. Both halves are required, and the error
+# must be the exact bare line: "failed to run custom build command" alone is
+# any build-script bug, which a retry cannot fix, and a build script that
+# fails on a missing file with an error context of its own produces the ENOENT
+# in a "Caused by:" detail line instead of the bare "Error:" line.
+custom_build_script_enoent() {
+  grep -q "failed to run custom build command" "$1" \
+    && grep -qE '^[[:space:]]*Error: No such file or directory \(os error 2\)[[:space:]]*$' "$1"
+}
+
 if grep -qE "$incremental_build_failure_pattern" "$1"; then
   echo "--- Detected incremental build failure, clearing cargo target directories"
   rm -rf target target-xcompile || true
   exit 199
 fi
 
+if custom_build_script_enoent "$1"; then
+  echo "--- Detected corrupted cached build script, clearing cargo target directories"
+  rm -rf target target-xcompile || true
+  exit 199
+fi
+
 # Nothing on disk is corrupted, so keep the target directories. Wiping them
 # would turn a network blip into a full rebuild of the workspace, here and in
 # every later job that shares the agent's target directory.

console/src/components/connect/ConnectDrawer.test.tsx

@@ -21,6 +21,7 @@ import {
   renderComponent,
   setFakeEnvironment,
 } from "~/test/utils";
+import { toBase64 } from "~/utils/format";
 import { parseDbVersion } from "~/version/api";
 
 import ConnectDrawer from "./ConnectDrawer";
@@ -49,6 +50,9 @@ describe("ConnectDrawer", () => {
     ).toBeVisible();
     expect(screen.getByText(/materialize-developer/)).toBeVisible();
     expect(screen.getByText("Install agent skills (optional)")).toBeVisible();
+    expect(
+      screen.getByText(/Agent skills give your coding agent access/),
+    ).toBeVisible();
   });
 
   it("switches MCP config format per client", async () => {
@@ -148,6 +152,15 @@ describe("ConnectDrawer", () => {
       await screen.findByText(/App password created and added to the command/),
     ).toBeVisible();
     expect(screen.getByText(/Authorization: Basic \*+/)).toBeVisible();
+
+    await user.click(screen.getByRole("button", { name: "visibility" }));
+
+    const expectedToken = toBase64(
+      `${dummyValidUser.email}:mzp_${"1".repeat(32)}${"2".repeat(32)}`,
+    );
+    expect(
+      screen.getByText((content) => content.includes(expectedToken)),
+    ).toBeVisible();
   });
 
   it("shows connection details on the External tools tab", async () => {
@@ -229,5 +242,9 @@ describe("ConnectDrawer", () => {
         ),
       ),
     ).toBeVisible();
+    expect(screen.getByText("Enter your password")).toBeVisible();
+    expect(
+      screen.getByRole("button", { name: "Create new password" }),
+    ).toBeVisible();
   });
 });

console/src/components/connect/ConnectDrawer.tsx

@@ -17,6 +17,7 @@ import SideDrawer from "~/components/SideDrawer";
 import { useAppConfig } from "~/config/useAppConfig";
 import { User } from "~/external-library-wrappers/frontegg";
 import { type AuthContextProps } from "~/external-library-wrappers/oidc";
+import { useHideIntercomLauncher } from "~/hooks/useIntercom";
 import { useSelfManagedProfile } from "~/hooks/useSelfManagedProfile";
 import { ConnectionIcon, MonitorIcon, TerminalIcon } from "~/icons";
 import { ClusterDetailParams } from "~/platform/clusters/ClusterRoutes";
@@ -233,6 +234,7 @@ const ConnectDrawer = ({
   forAppPassword,
 }: ConnectDrawerProps) => {
   const appConfig = useAppConfig();
+  useHideIntercomLauncher(isOpen);
 
   return (
     <SideDrawer

console/src/components/connect/ConnectExternalToolsPanel.tsx

@@ -7,26 +7,17 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
-import {
-  Box,
-  Button,
-  HStack,
-  Input,
-  Text,
-  useTheme,
-  VStack,
-} from "@chakra-ui/react";
+import { Box, HStack, useTheme, VStack } from "@chakra-ui/react";
 import React, { useState } from "react";
 
-import { SecretCopyableBox } from "~/components/copyableComponents";
-import TextLink from "~/components/TextLink";
-import { useCreateApiToken } from "~/queries/frontegg";
 import { MaterializeTheme } from "~/theme";
 import { obfuscateSecret } from "~/utils/format";
 
 import {
   ConnectionDetailRow,
   ConnectStep,
+  CreateAppPasswordRow,
+  IdTokenRow,
   LabeledCommandBox,
 } from "./connectComponents";
 import {
@@ -35,167 +26,6 @@ import {
   ExternalToolId,
 } from "./connectOptions";
 
-const DETAIL_LABEL_WIDTH = "88px";
-
-/** Inline app password creation: name it, create it, copy it once. */
-const CreateAppPasswordRow = ({
-  onCreated,
-}: {
-  onCreated: (password: string) => void;
-}) => {
-  const { colors } = useTheme<MaterializeTheme>();
-  const [isNaming, setIsNaming] = useState(false);
-  const [name, setName] = useState("");
-  const {
-    mutate: createAppPassword,
-    isPending,
-    data: newPassword,
-  } = useCreateApiToken();
-
-  React.useEffect(() => {
-    if (newPassword?.password) {
-      onCreated(newPassword.password);
-    }
-  }, [newPassword, onCreated]);
-
-  const create = () => {
-    if (name.trim().length === 0 || isPending) return;
-    createAppPassword({ type: "personal", description: name.trim() });
-  };
-
-  return (
-    <Box>
-      <HStack alignItems="center" spacing="3">
-        <Text
-          fontSize="sm"
-          color={colors.foreground.secondary}
-          w={DETAIL_LABEL_WIDTH}
-          flexShrink={0}
-        >
-          Password
-        </Text>
-        {newPassword?.password ? (
-          <SecretCopyableBox
-            label="Password"
-            contents={newPassword.password}
-            obfuscatedContent={newPassword.obfuscatedPassword}
-            overflow="hidden"
-            flex="1"
-            w="auto"
-            minWidth={0}
-          />
-        ) : isNaming ? (
-          <HStack spacing="2" flex="1">
-            <Input
-              value={name}
-              onChange={(event) => setName(event.target.value)}
-              maxW="220px"
-              isDisabled={isPending}
-              placeholder="Password name"
-              aria-label="App password name"
-              autoFocus
-              onKeyDown={(event) => {
-                if (event.key === "Enter") create();
-              }}
-            />
-            <Button
-              variant="primary"
-              size="sm"
-              px="3"
-              flexShrink={0}
-              isLoading={isPending}
-              loadingText="Creating"
-              isDisabled={name.trim().length === 0}
-              onClick={create}
-            >
-              Create
-            </Button>
-            <Button
-              variant="borderless"
-              size="sm"
-              flexShrink={0}
-              isDisabled={isPending}
-              onClick={() => {
-                setIsNaming(false);
-                setName("");
-              }}
-            >
-              Cancel
-            </Button>
-          </HStack>
-        ) : (
-          <Button
-            variant="secondary"
-            size="sm"
-            onClick={() => setIsNaming(true)}
-          >
-            Create new password
-          </Button>
-        )}
-      </HStack>
-      {isNaming && !newPassword?.password && (
-        <Text
-          fontSize="sm"
-          color={colors.foreground.secondary}
-          mt="1.5"
-          ml={`calc(${DETAIL_LABEL_WIDTH} + 12px)`}
-        >
-          You are naming this password. The password itself is generated for
-          you.
-        </Text>
-      )}
-      {newPassword?.password && (
-        <Text
-          fontSize="sm"
-          color={colors.foreground.secondary}
-          mt="1.5"
-          ml={`calc(${DETAIL_LABEL_WIDTH} + 12px)`}
-        >
-          Copy it now. It will not be shown again. Manage in{" "}
-          <TextLink href="/access/app-passwords">App Passwords</TextLink>.
-        </Text>
-      )}
-    </Box>
-  );
-};
-
-/** Self-managed OIDC deployments use the ID token as the SQL password. */
-const IdTokenRow = ({ idToken }: { idToken: string }) => {
-  const { colors } = useTheme<MaterializeTheme>();
-
-  return (
-    <Box>
-      <HStack alignItems="center" spacing="3">
-        <Text
-          fontSize="sm"
-          color={colors.foreground.secondary}
-          w={DETAIL_LABEL_WIDTH}
-          flexShrink={0}
-        >
-          Password
-        </Text>
-        <SecretCopyableBox
-          label="idToken"
-          contents={idToken}
-          obfuscatedContent={obfuscateSecret(idToken)}
-          overflow="hidden"
-          flex="1"
-          w="auto"
-          minWidth={0}
-        />
-      </HStack>
-      <Text
-        fontSize="sm"
-        color={colors.foreground.secondary}
-        mt="1.5"
-        ml={`calc(${DETAIL_LABEL_WIDTH} + 12px)`}
-      >
-        When prompted for a password, paste this ID token.
-      </Text>
-    </Box>
-  );
-};
-
 export interface ConnectExternalToolsPanelProps {
   ctx: ConnectContext;
 }
@@ -219,9 +49,7 @@ export const ConnectExternalToolsPanel = ({
     password: createdPassword,
     ssl: ctx.ssl,
   });
-  // Mask the password in the rendered snippet. The copy button copies the
-  // real value.
-  const displaySnippet = createdPassword
+  const obfuscatedSnippet = createdPassword
     ? snippet.replaceAll(createdPassword, obfuscateSecret(createdPassword))
     : undefined;
 
@@ -277,7 +105,7 @@ export const ConnectExternalToolsPanel = ({
           <LabeledCommandBox
             label={tool.instruction}
             contents={snippet}
-            displayContents={displaySnippet}
+            obfuscatedContents={obfuscatedSnippet}
           />
         </VStack>
       </ConnectStep>

console/src/components/connect/ConnectMcpPanel.tsx

@@ -293,9 +293,7 @@ export const ConnectMcpPanel = ({ ctx }: ConnectMcpPanelProps) => {
     baseUrl: ctx.mcpBaseUrl,
     token: oauthActive ? undefined : (mcpToken ?? MCP_TOKEN_PLACEHOLDER),
   });
-  // Mask the token in the rendered snippet. The copy button copies the real
-  // value.
-  const displaySnippet = mcpToken
+  const obfuscatedSnippet = mcpToken
     ? snippet.replace(mcpToken, obfuscateSecret(mcpToken))
     : undefined;
   const installLink =
@@ -333,7 +331,7 @@ export const ConnectMcpPanel = ({ ctx }: ConnectMcpPanelProps) => {
               : undefined
         }
         contents={snippet}
-        displayContents={displaySnippet}
+        obfuscatedContents={obfuscatedSnippet}
       />
       {ctx.oauthAvailable && (
         <HStack justifyContent="flex-end">
@@ -366,8 +364,8 @@ export const ConnectMcpPanel = ({ ctx }: ConnectMcpPanelProps) => {
   const skillsStep = (
     <VStack alignItems="stretch" spacing="2">
       <Text fontSize="sm" color={colors.foreground.secondary}>
-        Ready-made instructions that help your agent work with Materialize
-        accurately.
+        Agent skills give your coding agent access to Materialize documentation,
+        reference material, and best practices.
       </Text>
       <LabeledCommandBox contents={AGENT_SKILLS_COMMAND} />
     </VStack>