diff --git a/src/renderer/components/team/provisioningSteps.ts b/src/renderer/components/team/provisioningSteps.ts
index 3a15804b..6446431e 100644
--- a/src/renderer/components/team/provisioningSteps.ts
+++ b/src/renderer/components/team/provisioningSteps.ts
@@ -3,7 +3,7 @@ export type ProvisioningStep = (typeof STEP_ORDER)[number];
 export const STEP_LABELS: Record<ProvisioningStep, string> = {
   validating: 'Validate',
   spawning: 'Start CLI',
-  monitoring: 'Wait for files',
+  monitoring: 'Provisioning',
   verifying: 'Verify',
   ready: 'Ready',
 };
diff --git a/src/renderer/utils/mentionLinkify.ts b/src/renderer/utils/mentionLinkify.ts
index 686df7b2..ca7466b4 100644
--- a/src/renderer/utils/mentionLinkify.ts
+++ b/src/renderer/utils/mentionLinkify.ts
@@ -24,8 +24,10 @@ export function linkifyMentionsInMarkdown(
   // Sort by name length descending for greedy matching
   const names = [...memberColorMap.keys()].sort((a, b) => b.length - a.length);
   const escaped = names.map((n) => n.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
-  // eslint-disable-next-line no-useless-escape -- escaped chars needed for regex character class
-  const pattern = new RegExp(`(^|\\s)@(${escaped.join('|')})(?=[\\s,.:;!?)\\]}\-]|$)`, 'gi');
+  const pattern = new RegExp(
+    `(^|[\\s(\\[{"\'])@(${escaped.join('|')})(?=[\\s,.:;!?)\\]}\-]|$)`,
+    'gi'
+  );
 
   return text.replace(pattern, (_match, prefix: string, name: string) => {
     // Find the canonical name (case-insensitive lookup)
@@ -53,8 +55,10 @@ export function linkifyTeamMentionsInMarkdown(
   // Sort by name length descending for greedy matching
   const sorted = [...names].sort((a, b) => b.length - a.length);
   const escaped = sorted.map((n) => n.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
-  // eslint-disable-next-line no-useless-escape -- escaped chars needed for regex character class
-  const pattern = new RegExp(`(^|\\s)@(${escaped.join('|')})(?=[\\s,.:;!?)\\]}\-]|$)`, 'gi');
+  const pattern = new RegExp(
+    `(^|[\\s(\\[{"\'])@(${escaped.join('|')})(?=[\\s,.:;!?)\\]}\-]|$)`,
+    'gi'
+  );
 
   return text.replace(pattern, (_match, prefix: string, name: string) => {
     const canonical = sorted.find((n) => n.toLowerCase() === name.toLowerCase()) ?? name;