From 0bc8bf1fe93ffe4bc1f7db116288415c71371b28 Mon Sep 17 00:00:00 2001
From: iliya <iliyazelenkog@gmail.com>
Date: Mon, 23 Mar 2026 17:51:09 +0200
Subject: [PATCH] feat(landing): enhance base URL handling and improve image
 paths

- Introduced baseURL configuration to dynamically set asset paths in the landing components.
- Updated AppLogo and HeroSection components to use baseURL for logo image sources.
- Refactored ScreenshotsSection to utilize a publicPath function for consistent image path handling.
- Improved LanguageSwitcher to synchronize the i18n locale with the store on mount.
- Enhanced TaskCommentInput to handle file uploads more robustly, including validation for empty files and improved error handling.
- Adjusted MessageComposer to conditionally support attachments based on team status.
---
 landing/components/common/AppLogo.vue         |   3 +-
 .../components/layout/LanguageSwitcher.vue    |   7 ++
 landing/components/sections/HeroSection.vue   |   3 +-
 .../sections/ScreenshotsSection.vue           |  21 ++---
 landing/composables/useLocation.ts            |  14 ++--
 landing/nuxt.config.ts                        |   4 +-
 landing/public/favicon-32.png                 | Bin 1579 -> 1717 bytes
 landing/public/favicon.ico                    | Bin 4286 -> 3638 bytes
 src/main/services/team/TeamInboxReader.ts     |   3 +-
 .../team/attachments/AttachmentDisplay.tsx    |   6 +-
 .../attachments/AttachmentPreviewItem.tsx     |   3 +-
 .../attachments/AttachmentPreviewList.tsx     |   3 +-
 .../team/dialogs/SendMessageDialog.tsx        |   2 +
 .../team/dialogs/TaskCommentInput.tsx         |  76 +++++++++++-------
 .../team/messages/MessageComposer.tsx         |  14 ++--
 src/renderer/hooks/useAttachments.ts          |   2 +-
 src/renderer/hooks/useComposerDraft.ts        |   2 +-
 .../hooks/useStableTeamMentionMeta.ts         |  45 +----------
 18 files changed, 100 insertions(+), 108 deletions(-)

diff --git a/landing/components/common/AppLogo.vue b/landing/components/common/AppLogo.vue
index 8cea3b4c..d8ed900f 100644
--- a/landing/components/common/AppLogo.vue
+++ b/landing/components/common/AppLogo.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
+const { baseURL } = useRuntimeConfig().app;
 </script>
 
 <template>
   <NuxtLink to="/" class="app-logo">
     <img
-      src="/logo-192.png"
+      :src="`${baseURL}logo-192.png`"
       alt="Claude Agent Teams"
       class="app-logo__img"
       width="36"
diff --git a/landing/components/layout/LanguageSwitcher.vue b/landing/components/layout/LanguageSwitcher.vue
index ccec5d7e..64824145 100644
--- a/landing/components/layout/LanguageSwitcher.vue
+++ b/landing/components/layout/LanguageSwitcher.vue
@@ -9,6 +9,13 @@ const switchLocalePath = useSwitchLocalePath();
 const props = defineProps<{ fullWidth?: boolean; compact?: boolean; iconOnly?: boolean }>();
 const localeStore = useLocaleStore();
 
+// Sync store with actual i18n locale on mount (handles SSG hydration)
+onMounted(() => {
+  if (locale.value && locale.value !== localeStore.current) {
+    localeStore.setLocale(locale.value as string, false);
+  }
+});
+
 const flagIconMap: Record<string, string> = {
   en: "circle-flags:us",
   ru: "circle-flags:ru"
diff --git a/landing/components/sections/HeroSection.vue b/landing/components/sections/HeroSection.vue
index 84cad3a8..d06cd4c8 100644
--- a/landing/components/sections/HeroSection.vue
+++ b/landing/components/sections/HeroSection.vue
@@ -3,6 +3,7 @@ import { mdiRobotOutline, mdiViewDashboardOutline, mdiOpenSourceInitiative } fro
 
 const { content } = useLandingContent();
 const { t } = useI18n();
+const { baseURL } = useRuntimeConfig().app;
 </script>
 
 <template>
@@ -13,7 +14,7 @@ const { t } = useI18n();
         <v-col cols="12" md="6" class="hero-section__content">
           <h1 class="hero-section__title">
             <img
-              src="/logo-192.png"
+              :src="`${baseURL}logo-192.png`"
               alt=""
               class="hero-section__logo"
               width="56"
diff --git a/landing/components/sections/ScreenshotsSection.vue b/landing/components/sections/ScreenshotsSection.vue
index 78ecbd61..9a6e73a1 100644
--- a/landing/components/sections/ScreenshotsSection.vue
+++ b/landing/components/sections/ScreenshotsSection.vue
@@ -4,19 +4,22 @@ import { register } from 'swiper/element/bundle';
 import { mdiChevronLeft, mdiChevronRight, mdiClose, mdiArrowExpand } from '@mdi/js';
 
 const { t } = useI18n();
+const { baseURL } = useRuntimeConfig().app;
 
 register();
 
+const publicPath = (path: string) => `${baseURL}${path.replace(/^\//, '')}`;
+
 const screenshots = [
-  { src: '/screenshots/1.jpg', alt: 'Kanban board with agent tasks' },
-  { src: '/screenshots/2.jpg', alt: 'Agent team communication' },
-  { src: '/screenshots/3.png', alt: 'Code review diff view' },
-  { src: '/screenshots/4.png', alt: 'Team management dashboard' },
-  { src: '/screenshots/5.png', alt: 'Live process monitoring' },
-  { src: '/screenshots/6.png', alt: 'Session context analysis' },
-  { src: '/screenshots/7.png', alt: 'Cross-team messaging' },
-  { src: '/screenshots/8.png', alt: 'Task details and comments' },
-  { src: '/screenshots/9.png', alt: 'Built-in code editor' },
+  { src: publicPath('/screenshots/1.jpg'), alt: 'Kanban board with agent tasks' },
+  { src: publicPath('/screenshots/2.jpg'), alt: 'Agent team communication' },
+  { src: publicPath('/screenshots/3.png'), alt: 'Code review diff view' },
+  { src: publicPath('/screenshots/4.png'), alt: 'Team management dashboard' },
+  { src: publicPath('/screenshots/5.png'), alt: 'Live process monitoring' },
+  { src: publicPath('/screenshots/6.png'), alt: 'Session context analysis' },
+  { src: publicPath('/screenshots/7.png'), alt: 'Cross-team messaging' },
+  { src: publicPath('/screenshots/8.png'), alt: 'Task details and comments' },
+  { src: publicPath('/screenshots/9.png'), alt: 'Built-in code editor' },
 ];
 
 const swiperRef = ref<HTMLElement | null>(null);
diff --git a/landing/composables/useLocation.ts b/landing/composables/useLocation.ts
index 7bc1aab8..815d5d38 100644
--- a/landing/composables/useLocation.ts
+++ b/landing/composables/useLocation.ts
@@ -16,15 +16,19 @@ export const useLocation = () => {
   };
 
   const initLocale = () => {
+    // Sync store with actual i18n locale (already resolved from route by nuxt-i18n)
+    const currentLocale = i18n?.locale?.value || "en";
+
     if (cookie.value) {
-      localeStore.setLocale(cookie.value, false);
-      if (i18n?.setLocale) {
-        i18n.setLocale(cookie.value);
-      } else if (i18n?.locale?.value) {
-        i18n.locale.value = cookie.value;
+      // Cookie exists — sync store, but don't override route-based locale
+      localeStore.setLocale(currentLocale, false);
+      if (cookie.value !== currentLocale) {
+        cookie.value = currentLocale;
       }
       return;
     }
+
+    // No cookie — detect from browser and set
     const detected = getBrowserLocale();
     localeStore.setLocale(detected, false);
     if (i18n?.setLocale) {
diff --git a/landing/nuxt.config.ts b/landing/nuxt.config.ts
index 324a3bca..148c0d2d 100644
--- a/landing/nuxt.config.ts
+++ b/landing/nuxt.config.ts
@@ -7,6 +7,7 @@ declare const process: any;
 const siteUrl = process.env.NUXT_PUBLIC_SITE_URL || "https://claude-agent-teams.dev";
 const githubRepo = process.env.NUXT_PUBLIC_GITHUB_REPO || "777genius/claude_agent_teams_ui";
 const githubReleasesUrl = `https://github.com/${githubRepo}/releases`;
+const baseURL = process.env.NUXT_APP_BASE_URL || "/";
 
 export default defineNuxtConfig({
   compatibilityDate: "2026-01-19",
@@ -15,9 +16,10 @@ export default defineNuxtConfig({
     inlineSSRStyles: false
   },
   app: {
+    baseURL,
     head: {
       link: [
-        { rel: "icon", type: "image/x-icon", href: "/favicon.ico" },
+        { rel: "icon", type: "image/x-icon", href: `${baseURL}favicon.ico` },
         { rel: "preconnect", href: "https://fonts.googleapis.com" },
         { rel: "preconnect", href: "https://fonts.gstatic.com", crossorigin: "" },
         { rel: "preload", href: "https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700;800&family=JetBrains+Mono:wght@400;600&display=swap", as: "style" },
diff --git a/landing/public/favicon-32.png b/landing/public/favicon-32.png
index 29f7bc78d1f2ef64c8c4e64bd4eb417c5f3c1cc7..b07f155084f82e6c87682458fdf3439d27d0a163 100644
GIT binary patch
literal 1717
zcmZ`(2~<-@6rBVW+>zvO*$70|m=N;A7D2WIjDReO7DY4^5)BoC5X6WJih@v2Mbrwo
zfL433b;Sj=;EEE!)>=2jUC>&qMXk1ONji~JT2D{^xijz0d-u-!=g*s8mM}Sb<S@oC
z0KiDaL|GEFT-$K4gR^W$`8nGnePU7^01Mp#C|Uu)TNo;O1VFwBfX8Y8q*VZ5Ih&6q
z1_MBypAf5(<2aKbm>9-D5FABu1R-cNgigm01aoqtqbNqBLC0y#7z8pQtsjv5H!vKx
z1tGs5{XX2GKMox_9se*x2Zey!4xqovz;b~0p$dVb5dDRq)+R@7FUi0O4na6$D1o6&
z6apa#oI~I&3}^9$QSnnMmD8$8zbQ<HD~_^pl!KvcCgB<)nW9Us&QMj70y%~<cy4~$
z>{Dy1-&bxi&s%s^D2yRcE`hrE3u4w9uN~fOZK$>sXPxrkNyL7t#idVAn9Q9&SxVOa
z86nGOVq+5{^S`NhbL+DCipjFAq%T;aq|s0>et2$S*VcOLj=h$`mA?cAs9CrN8~0@6
z9xU8FGGNx$6^~EvwH~jxRxZ5m;~mCea6`f}XX{(_1(&8K*YKPrY}|{3^EtS;yEB>j
z$)+#nUs;iTc2a02JQN1Ob#)=VJtHE<&+&8}&m{!jE>eYbj*myU8&^zV@Pn{OeoP2C
zgG&gV2|>6x#h*V3N4OZmMiF>G1eYa{2WE`pg>o>yfETI=%-}M|VF-(XxsqPdk&>A%
zOdl79k6bcS;uVb}&KSbvv4!fWW%)^)(xR5RvV;g73lYZe%<Ve6+8QjFjN5i*>SD@U
zKezO>TXZpH1ja$=xRVnyXHscvx#fPFWzM7$c)kIAd2RNE0KQD4SZ=jivumus!qyZU
zk|rym{nx`bn)>=oMz+jsZkP4+$k^@eZ1aa0oZHzwG84Nkn6~)|lu$m6iI!b7UbNb7
zguOu#C%1oWhmH26@w$E9!Tz>a$ih{Do#|?I#{C}5Q9`Ap(;P&8ek4hALdR&dX<Bs#
zLURl_z22TWRN>{X9pdh*<2`xt@Zm#o!;=xYFPa{FFQC(j*Jq!bQars#hr8<<_p8#v
z3Qi!gjB)y19bjYQkpq4WWJAIJ`G@A`9$DUzGF^PKH+9CXn<2q1%`J-;ncv${i|byf
z2Xl>=?pFM`|Jf>2eZA>XRaevNK{2a>CsMkWTx#9XyZ-Va1J`6a-|<8H%84lteZy|e
zu9=mPteTNDed^4_X;V^_DfSyKq!%5#bLjZC1G|pyJiMo6_g4qM{jP1O_nl7gd#z%Y
zbw$~_ZjbovT5*2&O9D+WR#BD8b=9{M4{GDLlCytnelr{uHWYP4BH)bvKuf{p%AK9v
zU+zmjnt3WSdU$=Xj1str-Ryd8cWUF3Gw0$GH#LqcX)i{?PT!gLbwTgdtQ(DeT}O@g
zwx^1W71ZSSAoW1uh1)HKe>@FU57}t%UDQ@v-Lty5bd>W1L+>Ns;Z5)74cYPfaFy|X
z?=GcB{EeSodM}9TTCLafJmR;G|Ez56(h`c>;;z~gIrkPhHUz6ED$XM#jYc;o41V^~
zZqx+&8*)U1>8(I;@nvmdx?|MEHNvG)Tf$}3+U64X;(C<xhU}J(U?qv09^}6YB$}Eu
zuQudV?c39Krt{>f)7f=%>&wrYAJ<4XH#dW)6`HDPvF|RyE|F=H723Es;0=8TKq=LM
zLAFMMg8>Hsc6AhB`<qg1u{!EN_GF#iKfa9^H$JEX8aIPH*^rTD&`8sBHP8UDNbD~V
zkpeNP@)b+{f~2HBUnG)>L@mpfF8@f7rO(i5jsGt=f3s}@6nG9)FzB*0d4{yCoR2hq
zQi(|F8`NJ!ADiw0HDhcV%>tcP8mXVF&sFB6rE7ri=uK1wOgarD<&Y7t)#hmoK<uw%
zZr8vpK9Eh&EzrzOmcgRgc{+VI@C_0hEj14R<xKmC)BC(|3FH8Ue6nnBgnId3t6e)U

delta 1518
zcmV<K1rhqS4XX^085ITq0047(dh`GQ00DDSM?wIu&K&8JKm|L0AfN*P1ONa40RR91
zAOHXW0IY^$^8f$^l}SWFR9FeUS6gfpRT%!xY`bN*tF}qoWlOs>Xe**tF$!Wx!4Qoa
z<0U4%_{I|^z8HNlJ{V(s&_v(y^2W2#7ZZ$$B0-c8HKCRuDX`iF3N5>h?e5UM%=rE1
z?Ci|xE-XUg+04v;IsfJR{{KIh*-=>2Mn*;w)vCY4_x&lQ@FvwM+r-yH-#l!U(KKZZ
zn-$`GqLhE6ySw}6d_M0s4cJl9K_-)V#q*qZ0e@1_i$O%y?EhzS?H^z<h?B&4|H_ps
zUk1Rjpp#AyzYRE_l6QR|v!Ay{9%A@lAZd>GCX=bva=CPWRCGFkp`pynj^ljBjID}9
zou%JWkfuRcsrELZ-ngheiA3_G>y}Qd;o;$Ay^a%%ZcA&)HLdn(4;<=sZ!M4U)c4?K
za3oKECLWJ%>+(Fcon`+Y$t4sW>HU?8x831jw}@JsN$1uw7hk&^Hjb<ZVf1z@F1{7^
zdSw_kn_Q-U#`o)5t&}5+iQ9*<vjxCDJoY_!v=eNlV%jchBmFgjmAfdpA-Op8^xTQ;
zrYDh14j}*6Q7jeCHgFgS*%+P<C_S(V_io&Y<?<p<o%<f;YyS{lrz*^Bc2y`yN&t~&
zXD;bEu{gHvd;^a?u^-*tz=gRpIP}$PC@#+GEX7%Ws*@SG2m4++fU)d2Y8BwyV+Zi{
z;SW%&RU4IPA=lM2b<`oOAs1l&lBpqVns@<|4*<_S?PJ5}1V+cEbjA+LESF5kX3B*8
z(Pw;&O#)jdUc_C!X^qh)b4@O^jS94q>zH_}Rb8xJE8uEjm?MSNiid0Ef*~fkG)H+@
zp{%lh>SO-A!b$-s(Wg>#=^@zBX^@I(H+_qxQmOZ(7Zqv^Z!*6%f|OV0p<?5>aM8!y
z><^g!^&tGZN8&C*3%J74@;v%e!*GlJIG@Ymo1-6L?(($8hz4NuaP6einfB+8j>3eh
zcwi<H16bG7hmrJyn9Ki$a=D0@!$rYX_o_&LCHrvq$Ro(jPouoLgcWx|?+9(sxUD4@
zahEN$%p(IIZuu(QQUU8?J=idGA7*pMO!kfHW(T+6;=&nRE}Uc53|y{Avw1>YWD!QJ
z^}Ly}ag^=mz;U{;Sj-{b6~~=-q*3!KsMag!OQp5!GIcT9$T@MNvPYTP1Q13SL@m32
z!K`E-brN1${1Y3v?K~bla`=o6j$@9p8g)F~w5{=3yS75?APB`bVMH2s19D@?b5Bk{
zo_=!4-0zuu6{G#*90PNOS$uc$pk535L}U<hBHD{9#16>i899hT1DjmTm=7}*HpzOl
ze*(`xyboiUtSFJY^fzYmKOwg;qgTCuIhI2_Q$1~J-Grwx1)*^(x%fyyrQCG}P{ZWL
zDP#w;$UX&gvHuWdqSH2>OheE@>_8&VfQJ<b4FX}*Fsk=x;1S%du4n+aXe`Cgtu9l>
z(g!(dRfrwM40-%;3PPb}8Xf4qEbtR&58=e@v)EeOrDeb8e$+C(AetVX$;Fg^i*UWY
zR;~jO4NxYek8j2;BadtAQ~6)8R9X<YhWE{pi?JFUT;Imp7DdT}DKYPUGuL`|aF>{7
z`!<BlIS>2;x$J@xugHG_8=xJzILpBl<8?i~*aR)Kv9YNy$;+sRC)X}xY#W4*qP2Be
zVu`GQffKK$xY^M<b6Vm<hl~1uuvrAQLFlNdnt(y4lU{o@A)B4Roq_Ssj)TKaJnkIl
zV5Sj~Hs}Q2N#BXQ5e5I2$B)OBmzS%lRPQCu>Ru{TC-6@Cn<G~~-<bRPi8ihO(v(W2
z)5&D-D#7=#5{<pou569i^`lkanOvZmqwl>_C|vzQ?3>?)@~y^7{6X1GW?t!L9Ad?G
zJDG=AiXW%y^<r`HbA!rJ&<URMdG5N^9W2olWpDB7y&ZD;%QpX*ct;Y6M9b&-zaN{b
U=QOIw82|tP07*qoM6N<$g7Vk-r2qf`

diff --git a/landing/public/favicon.ico b/landing/public/favicon.ico
index 4274409aca665535ec3d53a159b8bf7a0c739433..99933316571f619bcad8715ef24140ebdcda5043 100644
GIT binary patch
literal 3638
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

literal 4286
zcmc(jO>7%Q6vsFB9%$qJ_Q%?3NbJ~FTL-5fgw!c5p^gAm)M^#Af&(I<D551GQIJqo
z5G@s^2qY*~g8(5#s7J&RfoMflZq31!1t$)OOAsgIgZ<~dS<kX@b`v)U*U>+3GP~N}
zf8NZS^+Zwn=*Mvs{;e!MpeUN6D8nS`QudR$Uwr6V=SNpnMUO<J($ubMkw~4?Ai-0A
zKeV<~ih<g;4Js+JRt@T_ld7aNNr`OTDkS)-+DF_9sYU|J<NDkG&4ct+BX%XSWlJA>
zX!9!+S0r1;|Ix#W@IZMWZkkjhL8v|c9(btnToAMBv3u{KYN%?R<c{4Rdy@xdH<*8)
zJb3I)d+^l+*Jof|a(_r|O0GY4yB<tU2TRn6&&R!Z@N@m`^*q?Rfyc6YaG^XW#BG~>
zY{G+~X=3jEY}pR;Fh#uOmp(`9(oG?5vxm*(LGZivKs6E747@x2g3G@38(J*#agq9L
zx~BEh-gyss@c0{e;GCGMhJ<e7lHlKP*@AyV^u_6#5usY<J-bT}CUIGwk9IA}Igrt!
zd!jVQam~b&`ElGm^A$kjW^wz8+{1{e25j<Z(lff93&~&41CQHf8*qr9j}745p=a>v
zkp-c1hn__~nnHs3F;#~}_v@60Zanz;VIFK6dz|K$*(u$^RHlHFqX&?;l0qj(4`M3)
z5R!DAJw(ZamxB%FqLbh0fuAGC&d<+9lX!0TK}-x}F=E6qqQ^0j%2MCs$l6IbZN8fW
z-+Me{Jp}Rn9=Pr2PiG65DU2g$I>@(`GZUEERYG~BDER-*fsY@OhcLeMz|k>H>~fMQ
z4P`L9ZxZ{G!^qIsna@7By*HW0?B2t4PaZp+?V?UZ9Wd9gjy#w;@1brDbVjZT$Fgv$
zG>#wVpU0h7=kamnX%ylENE<Pce`XI;yAU75Cr4+o{K|W{Ie#9f_Lq?`tkrDk!{<Tp
zLp(75(QF3wH(o|-X%VgKU*Pw*&f-LI3`0g#aEFNfAhk~vOZembHQ@U9z|wd4<@Jv+
zIkGdD&pz57EMl{Q^1%G#W25-<;+tsR{sFB!xAFJox3O@bgzdV$N(+-uq4ECLXfFSX
z=Fc_!b>T}KD^7&-+a4r8%)_3cLHu-P4$Z5V(OmoxwX>&D&gVs~aXqlOF3Y(h?!NW`
zaP3>*>NmJ``W@^Z%!s{kz3*~<evpTlVPJYk9#@VZ!Q#wO8q+9JmW>$g2fQb+xScX>
zy7mY@n|Tpej?LlljxpGjSIL%f)mo$+bn=5d@ZQTc;8>=3CcpFfK7Qx2_&V>A922I6
zIEm-Zdw&u~@;UlF&~qBycnGQuW*Eek?+6(^F6~`jJJ<uW>p^_(3tE%XhhQ^bcyPZz
zO1_L9Tl!e*f!WnC{ze|yi|2zFlIxEfcwly#RJ#uz_^iil#WIWv#g!g<;Ikf|H<_(i
zu~=W*Lof2cXFWb|@|oA=vj@(DI~P1Bye`(%#d>@7s<p6oP4YRTPE0=QWk~Ye+xhQ+
Hp8x$1KTA{g

diff --git a/src/main/services/team/TeamInboxReader.ts b/src/main/services/team/TeamInboxReader.ts
index 78d6350e..11e5f1f9 100644
--- a/src/main/services/team/TeamInboxReader.ts
+++ b/src/main/services/team/TeamInboxReader.ts
@@ -1,7 +1,6 @@
-import { createHash } from 'crypto';
-
 import { FileReadTimeoutError, readFileUtf8WithTimeout } from '@main/utils/fsRead';
 import { getTeamsBasePath } from '@main/utils/pathDecoder';
+import { createHash } from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
 
diff --git a/src/renderer/components/team/attachments/AttachmentDisplay.tsx b/src/renderer/components/team/attachments/AttachmentDisplay.tsx
index 33ff6d87..ce4e151b 100644
--- a/src/renderer/components/team/attachments/AttachmentDisplay.tsx
+++ b/src/renderer/components/team/attachments/AttachmentDisplay.tsx
@@ -1,10 +1,8 @@
 import { useEffect, useState } from 'react';
 
-import { Loader2 } from 'lucide-react';
-
-import { isImageMime } from '@renderer/utils/attachmentUtils';
-
 import { FileIcon } from '@renderer/components/team/editor/FileIcon';
+import { isImageMime } from '@renderer/utils/attachmentUtils';
+import { Loader2 } from 'lucide-react';
 
 import { AttachmentThumbnail } from './AttachmentThumbnail';
 import { ImageLightbox } from './ImageLightbox';
diff --git a/src/renderer/components/team/attachments/AttachmentPreviewItem.tsx b/src/renderer/components/team/attachments/AttachmentPreviewItem.tsx
index d81981f7..a1f9a3e9 100644
--- a/src/renderer/components/team/attachments/AttachmentPreviewItem.tsx
+++ b/src/renderer/components/team/attachments/AttachmentPreviewItem.tsx
@@ -1,8 +1,7 @@
+import { FileIcon } from '@renderer/components/team/editor/FileIcon';
 import { formatFileSize, isImageMime } from '@renderer/utils/attachmentUtils';
 import { Ban, X } from 'lucide-react';
 
-import { FileIcon } from '@renderer/components/team/editor/FileIcon';
-
 import { AttachmentThumbnail } from './AttachmentThumbnail';
 
 import type { AttachmentPayload } from '@shared/types';
diff --git a/src/renderer/components/team/attachments/AttachmentPreviewList.tsx b/src/renderer/components/team/attachments/AttachmentPreviewList.tsx
index 873c4488..7bef2cd3 100644
--- a/src/renderer/components/team/attachments/AttachmentPreviewList.tsx
+++ b/src/renderer/components/team/attachments/AttachmentPreviewList.tsx
@@ -1,8 +1,7 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 
-import { AlertCircle, X } from 'lucide-react';
-
 import { isImageMime } from '@renderer/utils/attachmentUtils';
+import { AlertCircle, X } from 'lucide-react';
 
 import { AttachmentPreviewItem } from './AttachmentPreviewItem';
 import { ImageLightbox } from './ImageLightbox';
diff --git a/src/renderer/components/team/dialogs/SendMessageDialog.tsx b/src/renderer/components/team/dialogs/SendMessageDialog.tsx
index 6879c46e..f1c512fc 100644
--- a/src/renderer/components/team/dialogs/SendMessageDialog.tsx
+++ b/src/renderer/components/team/dialogs/SendMessageDialog.tsx
@@ -124,6 +124,7 @@ export const SendMessageDialog = ({
     addFiles,
     removeAttachment,
     clearAttachments,
+    clearError: clearAttachmentError,
     handlePaste,
     handleDrop,
   } = useAttachments({ persistenceKey: `sendMessage:${teamName}:attachments` });
@@ -417,6 +418,7 @@ export const SendMessageDialog = ({
               attachments={attachments}
               onRemove={removeAttachment}
               error={attachmentError ?? fileRestrictionError}
+              onDismissError={clearAttachmentError}
               disabled={attachmentsBlocked}
               disabledHint="File attachments are only supported when sending to the team lead while the team is online. Remove attachments or switch recipient."
             />
diff --git a/src/renderer/components/team/dialogs/TaskCommentInput.tsx b/src/renderer/components/team/dialogs/TaskCommentInput.tsx
index 55cdcda6..bbf69ae8 100644
--- a/src/renderer/components/team/dialogs/TaskCommentInput.tsx
+++ b/src/renderer/components/team/dialogs/TaskCommentInput.tsx
@@ -88,12 +88,14 @@ export const TaskCommentInput = ({
     !addingComment;
 
   const addFiles = useCallback(
-    (files: FileList | File[]) => {
+    async (files: FileList | File[]) => {
       setAttachError(null);
       const fileArray = Array.from(files);
+
+      // 1. Separate unsupported files → path prepend
+      const supported: File[] = [];
       for (const file of fileArray) {
         if (categorizeFile(file) === 'unsupported') {
-          // Insert absolute file path into comment text for unsupported types
           const filePath = (file as { path?: string }).path;
           if (filePath) {
             const current = draft.value;
@@ -101,37 +103,51 @@ export const TaskCommentInput = ({
           }
           continue;
         }
+        if (file.size === 0) {
+          setAttachError(`File "${file.name}" is empty`);
+          continue;
+        }
         if (file.size > MAX_FILE_SIZE) {
           setAttachError(
             `File too large: ${(file.size / (1024 * 1024)).toFixed(1)} MB (max 20 MB)`
           );
           continue;
         }
-        const reader = new FileReader();
-        reader.onload = () => {
-          const result = reader.result as string;
-          const base64 = result.split(',')[1];
-          if (!base64) return;
-          const id = crypto.randomUUID();
-          setPendingAttachments((prev) => {
-            if (prev.length >= MAX_ATTACHMENTS) {
-              setAttachError(`Maximum ${MAX_ATTACHMENTS} attachments per comment`);
-              return prev;
-            }
-            return [
-              ...prev,
-              {
-                id,
-                filename: file.name,
-                mimeType: getEffectiveMimeType(file),
-                base64Data: base64,
-                previewUrl: result,
-                size: file.size,
-              },
-            ];
-          });
-        };
-        reader.readAsDataURL(file);
+        supported.push(file);
+      }
+
+      if (supported.length === 0) return;
+
+      // 2. Read all files sequentially to avoid race condition with MAX_ATTACHMENTS
+      for (const file of supported) {
+        const result = await new Promise<string | null>((resolve) => {
+          const reader = new FileReader();
+          reader.onload = () => resolve(reader.result as string);
+          reader.onerror = () => resolve(null);
+          reader.readAsDataURL(file);
+        });
+        if (!result) continue;
+        const base64 = result.split(',')[1];
+        if (!base64) continue;
+
+        const id = crypto.randomUUID();
+        setPendingAttachments((prev) => {
+          if (prev.length >= MAX_ATTACHMENTS) {
+            setAttachError(`Maximum ${MAX_ATTACHMENTS} attachments per comment`);
+            return prev;
+          }
+          return [
+            ...prev,
+            {
+              id,
+              filename: file.name,
+              mimeType: getEffectiveMimeType(file),
+              base64Data: base64,
+              previewUrl: result,
+              size: file.size,
+            },
+          ];
+        });
       }
     },
     [draft]
@@ -194,12 +210,12 @@ export const TaskCommentInput = ({
       for (const item of Array.from(items)) {
         if (item.kind === 'file') {
           const file = item.getAsFile();
-          if (file && categorizeFile(file) !== 'unsupported') pastedFiles.push(file);
+          if (file) pastedFiles.push(file);
         }
       }
       if (pastedFiles.length > 0) {
         e.preventDefault();
-        addFiles(pastedFiles);
+        void addFiles(pastedFiles);
       }
     },
     [addFiles]
@@ -318,7 +334,7 @@ export const TaskCommentInput = ({
           multiple
           className="hidden"
           onChange={(e) => {
-            if (e.target.files) addFiles(e.target.files);
+            if (e.target.files) void addFiles(e.target.files);
 
             e.target.value = '';
           }}
diff --git a/src/renderer/components/team/messages/MessageComposer.tsx b/src/renderer/components/team/messages/MessageComposer.tsx
index d1a14eaa..e8105b08 100644
--- a/src/renderer/components/team/messages/MessageComposer.tsx
+++ b/src/renderer/components/team/messages/MessageComposer.tsx
@@ -255,7 +255,7 @@ export const MessageComposer = ({
   // const leadContext = useStore((s) =>
   //   isLeadAgentRecipient ? s.leadContextByTeam[teamName] : undefined
   // );
-  const supportsAttachments = isLeadRecipient && !isCrossTeam;
+  const supportsAttachments = isLeadRecipient && !isCrossTeam && !!isTeamAlive;
   const canAttach = supportsAttachments && draft.canAddMore;
   const attachmentsBlocked = draft.attachments.length > 0 && !supportsAttachments;
   const canSend =
@@ -370,22 +370,22 @@ export const MessageComposer = ({
       e.preventDefault();
       dragCounterRef.current = 0;
       setIsDragOver(false);
-      if (!isLeadRecipient) {
+      if (!supportsAttachments) {
         const files = e.dataTransfer?.files;
         if (files?.length) {
           showFileRestrictionError();
         }
         return;
       }
-      if (canAttach) draftHandleDrop(e);
+      draftHandleDrop(e);
     },
-    [isLeadRecipient, canAttach, draftHandleDrop, showFileRestrictionError]
+    [supportsAttachments, draftHandleDrop, showFileRestrictionError]
   );
 
   const { handlePaste: draftHandlePaste } = draft;
   const handlePasteWrapper = useCallback(
     (e: React.ClipboardEvent) => {
-      if (!isLeadRecipient) {
+      if (!supportsAttachments) {
         const hasFiles = Array.from(e.clipboardData.items).some((item) => item.kind === 'file');
         if (hasFiles) {
           e.preventDefault();
@@ -393,9 +393,9 @@ export const MessageComposer = ({
         }
         return;
       }
-      if (canAttach) draftHandlePaste(e);
+      draftHandlePaste(e);
     },
-    [isLeadRecipient, canAttach, draftHandlePaste, showFileRestrictionError]
+    [supportsAttachments, draftHandlePaste, showFileRestrictionError]
   );
 
   const remaining = MAX_TEXT_LENGTH - trimmed.length;
diff --git a/src/renderer/hooks/useAttachments.ts b/src/renderer/hooks/useAttachments.ts
index 48210114..5816cce7 100644
--- a/src/renderer/hooks/useAttachments.ts
+++ b/src/renderer/hooks/useAttachments.ts
@@ -1,13 +1,13 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 
 import { draftStorage } from '@renderer/services/draftStorage';
-import { categorizeFile } from '@shared/constants/attachments';
 import {
   fileToAttachmentPayload,
   MAX_FILES,
   MAX_TOTAL_SIZE,
   validateAttachment,
 } from '@renderer/utils/attachmentUtils';
+import { categorizeFile } from '@shared/constants/attachments';
 
 import type { AttachmentPayload } from '@shared/types';
 
diff --git a/src/renderer/hooks/useComposerDraft.ts b/src/renderer/hooks/useComposerDraft.ts
index 81be33f6..bfdc2484 100644
--- a/src/renderer/hooks/useComposerDraft.ts
+++ b/src/renderer/hooks/useComposerDraft.ts
@@ -17,13 +17,13 @@ import {
   type ComposerDraftSnapshot,
   composerDraftStorage,
 } from '@renderer/services/composerDraftStorage';
-import { categorizeFile } from '@shared/constants/attachments';
 import {
   fileToAttachmentPayload,
   MAX_FILES,
   MAX_TOTAL_SIZE,
   validateAttachment,
 } from '@renderer/utils/attachmentUtils';
+import { categorizeFile } from '@shared/constants/attachments';
 
 import type { InlineChip } from '@renderer/types/inlineChip';
 import type { AgentActionMode, AttachmentPayload } from '@shared/types';
diff --git a/src/renderer/hooks/useStableTeamMentionMeta.ts b/src/renderer/hooks/useStableTeamMentionMeta.ts
index 235f5e2f..9ec9903c 100644
--- a/src/renderer/hooks/useStableTeamMentionMeta.ts
+++ b/src/renderer/hooks/useStableTeamMentionMeta.ts
@@ -1,4 +1,4 @@
-import { useMemo, useRef } from 'react';
+import { useMemo } from 'react';
 
 import type { TeamSummary } from '@shared/types';
 
@@ -35,29 +35,6 @@ function buildTeamMentionEntries(teams: readonly TeamSummary[]): TeamMentionEntr
     .sort(compareTeamMentionEntries);
 }
 
-function areTeamMentionEntriesEqual(
-  prev: readonly TeamMentionEntry[],
-  next: readonly TeamMentionEntry[]
-): boolean {
-  if (prev === next) return true;
-  if (prev.length !== next.length) return false;
-
-  for (let i = 0; i < prev.length; i++) {
-    const prevEntry = prev[i];
-    const nextEntry = next[i];
-    if (
-      prevEntry.teamName !== nextEntry.teamName ||
-      prevEntry.displayName !== nextEntry.displayName ||
-      prevEntry.color !== nextEntry.color ||
-      prevEntry.deletedAt !== nextEntry.deletedAt
-    ) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
 function buildTeamMentionMeta(entries: readonly TeamMentionEntry[]): TeamMentionMeta {
   if (entries.length === 0) {
     return { teamNames: EMPTY_TEAM_NAMES, teamColorByName: EMPTY_TEAM_COLOR_MAP };
@@ -84,24 +61,8 @@ function buildTeamMentionMeta(entries: readonly TeamMentionEntry[]): TeamMention
 
 export function useStableTeamMentionMeta(teams: readonly TeamSummary[]): TeamMentionMeta {
   const entries = useMemo(() => buildTeamMentionEntries(teams), [teams]);
-  const stableRef = useRef<{ entries: readonly TeamMentionEntry[]; value: TeamMentionMeta } | null>(
-    null
-  );
 
-  // Intentional ref-as-cache pattern: avoids allocating a new object every
-  // render while still returning a referentially-stable value when the
-  // underlying data hasn't changed.
+  const meta = useMemo(() => buildTeamMentionMeta(entries), [entries]);
 
-  if (
-    stableRef.current === null ||
-    !areTeamMentionEntriesEqual(stableRef.current.entries, entries)
-  ) {
-    stableRef.current = {
-      entries,
-      value: buildTeamMentionMeta(entries),
-    };
-  }
-
-  // eslint-disable-next-line react-hooks/refs -- stable ref cache pattern
-  return stableRef.current.value;
+  return meta;
 }