diff --git a/apps/app/src/app/components/den-settings-panel.tsx b/apps/app/src/app/components/den-settings-panel.tsx
index bf33410b9..6dc7a06b2 100644
--- a/apps/app/src/app/components/den-settings-panel.tsx
+++ b/apps/app/src/app/components/den-settings-panel.tsx
@@ -21,6 +21,7 @@ import {
   readDenTemplateCacheSnapshot,
 } from "../lib/den-template-cache";
 import { usePlatform } from "../context/platform";
+import { t } from "../../i18n";
 
 type DenSettingsPanelProps = {
   developerMode: boolean;
@@ -55,18 +56,18 @@ function workerStatusMeta(status: string) {
   const normalized = status.trim().toLowerCase();
   switch (normalized) {
     case "healthy":
-      return { label: "Ready", tone: "ready" as const, canOpen: true };
+      return { label: t("den.status_ready"), tone: "ready" as const, canOpen: true };
     case "provisioning":
-      return { label: "Provisioning", tone: "warning" as const, canOpen: false };
+      return { label: t("den.status_provisioning"), tone: "warning" as const, canOpen: false };
     case "failed":
-      return { label: "Failed", tone: "error" as const, canOpen: false };
+      return { label: t("den.status_failed"), tone: "error" as const, canOpen: false };
     case "stopped":
-      return { label: "Stopped", tone: "neutral" as const, canOpen: false };
+      return { label: t("den.status_stopped"), tone: "neutral" as const, canOpen: false };
     default:
       return {
         label: normalized
           ? `${normalized.slice(0, 1).toUpperCase()}${normalized.slice(1)}`
-          : "Unknown",
+          : t("den.status_unknown"),
         tone: "neutral" as const,
         canOpen: normalized === "ready",
       };
@@ -145,10 +146,10 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
   });
 
   const summaryLabel = createMemo(() => {
-    if (authError()) return "Needs attention";
-    if (sessionBusy()) return "Checking session";
-    if (isSignedIn()) return "Connected";
-    return "Signed out";
+    if (authError()) return t("den.summary_needs_attention");
+    if (sessionBusy()) return t("den.summary_checking");
+    if (isSignedIn()) return t("den.summary_connected");
+    return t("den.summary_signed_out");
   });
 
   createEffect(() => {
@@ -177,8 +178,8 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
     platform.openLink(buildDenAuthUrl(baseUrl(), mode));
     setStatusMessage(
       mode === "sign-up"
-        ? "Finish account creation in your browser to connect OpenWork."
-        : "Finish signing in in your browser to connect OpenWork.",
+        ? t("den.finish_creation")
+        : t("den.finish_sign_in"),
     );
     setAuthError(null);
   };
@@ -300,7 +301,11 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
   const applyBaseUrl = () => {
     const normalized = normalizeDenBaseUrl(baseUrlDraft());
     if (!normalized) {
+<<<<<<< HEAD
+      setBaseUrlError(t("den.invalid_url"));
+=======
       setBaseUrlError("Enter a valid http:// or https:// Cloud control plane URL.");
+>>>>>>> upstream/dev
       return;
     }
 
@@ -313,7 +318,11 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
 
     setBaseUrl(resolved.baseUrl);
     setBaseUrlDraft(resolved.baseUrl);
+<<<<<<< HEAD
+    clearSignedInState(t("den.url_updated"));
+=======
     clearSignedInState("Updated the Cloud control plane URL. Sign in again to continue.");
+>>>>>>> upstream/dev
   };
 
   const refreshOrgs = async (quiet = false) => {
@@ -343,11 +352,11 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
       });
       if (!quiet && response.orgs.length > 0) {
         setStatusMessage(
-          `Loaded ${response.orgs.length} org${response.orgs.length === 1 ? "" : "s"}.`,
+          t("den.loaded_orgs").replace("{count}", String(response.orgs.length)),
         );
       }
     } catch (error) {
-      setOrgsError(error instanceof Error ? error.message : "Failed to load orgs.");
+      setOrgsError(error instanceof Error ? error.message : t("den.failed_load_orgs"));
     } finally {
       setOrgsBusy(false);
     }
@@ -367,14 +376,15 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
       const nextWorkers = await client().listWorkers(orgId, 20);
       setWorkers(nextWorkers);
       if (!quiet) {
+        const orgName = activeOrg()?.name ?? "this org";
         setStatusMessage(
           nextWorkers.length > 0
-            ? `Loaded ${nextWorkers.length} worker${nextWorkers.length === 1 ? "" : "s"} for ${activeOrg()?.name ?? "this org"}.`
-            : `No workers found for ${activeOrg()?.name ?? "this org"}.`,
+            ? t("den.loaded_workers").replace("{count}", String(nextWorkers.length)).replace("{org}", orgName)
+            : t("den.no_workers_found").replace("{org}", orgName),
         );
       }
     } catch (error) {
-      setWorkersError(error instanceof Error ? error.message : "Failed to load workers.");
+      setWorkersError(error instanceof Error ? error.message : t("den.failed_load_workers"));
     } finally {
       setWorkersBusy(false);
     }
@@ -431,7 +441,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
       .then((nextUser) => {
         if (cancelled) return;
         setUser(nextUser);
-        setStatusMessage(`Signed in as ${nextUser.email}.`);
+        setStatusMessage(t("den.signed_in_as").replace("{email}", nextUser.email));
       })
       .catch((error) => {
         if (cancelled) return;
@@ -441,7 +451,11 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
           clearSessionState();
         }
         setAuthError(
+<<<<<<< HEAD
+          error instanceof Error ? error.message : t("den.no_session"),
+=======
           error instanceof Error ? error.message : "No active Cloud session found.",
+>>>>>>> upstream/dev
         );
       })
       .finally(() => {
@@ -484,13 +498,22 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
         setAuthError(null);
         setStatusMessage(
           customEvent.detail.email?.trim()
+<<<<<<< HEAD
+            ? t("den.connected_as").replace("{email}", customEvent.detail.email.trim())
+            : t("den.connected"),
+=======
             ? `Connected OpenWork Cloud as ${customEvent.detail.email.trim()}.`
             : "Connected OpenWork Cloud.",
+>>>>>>> upstream/dev
         );
       } else if (customEvent.detail?.status === "error") {
         setAuthError(
           customEvent.detail.message?.trim() ||
+<<<<<<< HEAD
+            t("den.sign_in_failed"),
+=======
             "Failed to finish OpenWork Cloud sign-in.",
+>>>>>>> upstream/dev
         );
       }
     };
@@ -520,15 +543,19 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
       setAuthBusy(false);
     }
 
+<<<<<<< HEAD
+    clearSignedInState(t("den.signed_out_msg"));
+=======
     clearSignedInState(
       "Signed out and cleared your OpenWork Cloud session on this device.",
     );
+>>>>>>> upstream/dev
   };
 
   const handleOpenWorker = async (workerId: string, workerName: string) => {
     const orgId = activeOrgId().trim();
     if (!orgId) {
-      setWorkersError("Choose an org before opening a worker.");
+      setWorkersError(t("den.choose_org"));
       return;
     }
 
@@ -541,9 +568,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
       const accessToken =
         tokens.ownerToken?.trim() || tokens.clientToken?.trim() || "";
       if (!openworkUrl || !accessToken) {
-        throw new Error(
-          "Worker is not ready to open yet. Try again after provisioning finishes.",
-        );
+        throw new Error(t("den.worker_not_ready"));
       }
 
       const ok = await props.connectRemoteWorkspace({
@@ -553,13 +578,13 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
         displayName: workerName,
       });
       if (!ok) {
-        throw new Error(`Failed to open ${workerName} in OpenWork.`);
+        throw new Error(t("den.failed_open_worker").replace("{name}", workerName));
       }
 
-      setStatusMessage(`Opened ${workerName} in OpenWork.`);
+      setStatusMessage(t("den.opened_worker").replace("{name}", workerName));
     } catch (error) {
       setWorkersError(
-        error instanceof Error ? error.message : `Failed to open ${workerName}.`,
+        error instanceof Error ? error.message : t("den.failed_open").replace("{name}", workerName),
       );
     } finally {
       setOpeningWorkerId(null);
@@ -626,6 +651,16 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
           <div class="space-y-2">
             <div class={headerBadgeClass}>
               <Cloud size={13} class="text-dls-secondary" />
+<<<<<<< HEAD
+              {t("den.title")}
+            </div>
+            <div>
+              <div class="text-sm font-medium text-dls-text">
+                {t("den.description")}
+              </div>
+              <div class="mt-1 max-w-[60ch] text-xs text-dls-secondary">
+                {t("den.tagline")}
+=======
               OpenWork Cloud
             </div>
             <div>
@@ -635,6 +670,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
               <div class="mt-1 max-w-[60ch] text-xs text-dls-secondary">
                 Sign in to OpenWork Cloud to keep your tasks alive even when your
                 computer sleeps.
+>>>>>>> upstream/dev
               </div>
             </div>
           </div>
@@ -649,11 +685,19 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
         <Show when={props.developerMode}>
           <div class="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-end">
             <TextInput
+<<<<<<< HEAD
+              label={t("den.control_plane_url_label")}
+              value={baseUrlDraft()}
+              onInput={(event) => setBaseUrlDraft(event.currentTarget.value)}
+              placeholder={DEFAULT_DEN_BASE_URL}
+              hint={t("den.control_plane_url_hint")}
+=======
               label="Cloud control plane URL"
               value={baseUrlDraft()}
               onInput={(event) => setBaseUrlDraft(event.currentTarget.value)}
               placeholder={DEFAULT_DEN_BASE_URL}
               hint="Developer mode only. Use this to target a local or self-hosted Cloud control plane. Changing it signs you out so the app can re-hydrate against the new control plane."
+>>>>>>> upstream/dev
               disabled={authBusy() || sessionBusy()}
             />
             <div class="flex flex-wrap items-center gap-2">
@@ -663,7 +707,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                 onClick={() => setBaseUrlDraft(baseUrl())}
                 disabled={authBusy() || sessionBusy()}
               >
-                Reset
+                {t("den.reset")}
               </Button>
               <Button
                 variant="secondary"
@@ -671,14 +715,14 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                 onClick={applyBaseUrl}
                 disabled={authBusy() || sessionBusy()}
               >
-                Save URL
+                {t("den.save_url")}
               </Button>
               <Button
                 variant="outline"
                 class="h-9 px-3 text-xs"
                 onClick={openControlPlane}
               >
-                Open in browser
+                {t("den.open_in_browser")}
                 <ArrowUpRight size={13} />
               </Button>
             </div>
@@ -704,6 +748,16 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
 
       <Show when={!isSignedIn()}>
         <div class={`${settingsPanelClass} space-y-4`}>
+<<<<<<< HEAD
+          <div class="space-y-2">
+            <div class="text-sm font-medium text-dls-text">
+              {t("den.sign_in_title")}
+            </div>
+            <div class="max-w-[54ch] text-sm text-dls-secondary">
+              {t("den.tagline")}
+            </div>
+          </div>
+=======
             <div class="space-y-2">
               <div class="text-sm font-medium text-dls-text">
                 Sign in to OpenWork Cloud
@@ -713,10 +767,11 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                 computer sleeps.
               </div>
             </div>
+>>>>>>> upstream/dev
 
           <div class="flex flex-wrap items-center gap-2">
             <Button variant="secondary" onClick={() => openBrowserAuth("sign-in")}>
-              Sign in
+              {t("den.sign_in")}
               <ArrowUpRight size={13} />
             </Button>
             <Button
@@ -724,7 +779,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
               class="text-xs h-9 px-3"
               onClick={() => openBrowserAuth("sign-up")}
             >
-              Create account
+              {t("den.create_account")}
               <ArrowUpRight size={13} />
             </Button>
             <Button
@@ -775,8 +830,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
           </Show>
 
           <div class={`${settingsPanelSoftClass} text-sm text-gray-10`}>
-            Finish auth in your browser and OpenWork will reconnect here
-            automatically.
+            {t("den.finish_auth")}
           </div>
         </div>
       </Show>
@@ -785,9 +839,13 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
         <div class="space-y-6">
           <div class={`${settingsPanelClass} space-y-4`}>
             <div>
+<<<<<<< HEAD
+              <div class="text-sm font-medium text-dls-text">{t("den.account_title")}</div>
+=======
               <div class="text-sm font-medium text-dls-text">Cloud account</div>
+>>>>>>> upstream/dev
               <div class="mt-1 text-xs text-dls-secondary">
-                Manage your connected account and organization.
+                {t("den.account_description")}
               </div>
             </div>
 
@@ -808,15 +866,19 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                   disabled={authBusy() || sessionBusy()}
                 >
                   <LogOut size={13} class="mr-1.5" />
-                  {authBusy() ? "Signing out..." : "Sign out"}
+                  {authBusy() ? t("den.signing_out") : t("den.sign_out")}
                 </Button>
               </div>
 
               <div class="ow-soft-card-quiet flex flex-col gap-3 rounded-xl p-3 sm:flex-row sm:items-center sm:justify-between">
                 <div class="min-w-0">
-                  <div class="text-sm font-medium text-dls-text">Active org</div>
+                  <div class="text-sm font-medium text-dls-text">{t("den.active_org")}</div>
                   <div class="truncate text-xs text-dls-secondary">
+<<<<<<< HEAD
+                    {t("den.workers_scoped")}
+=======
                     Cloud workers and team templates are scoped to the selected org.
+>>>>>>> upstream/dev
                   </div>
                 </div>
                 <div class="flex items-center gap-2 shrink-0">
@@ -835,7 +897,11 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                         activeOrgName: nextOrg?.name ?? null,
                       });
                       setStatusMessage(
+<<<<<<< HEAD
+                        t("den.switched_org").replace("{org}", activeOrg()?.name ?? "the selected org"),
+=======
                         `Switched to ${nextOrg?.name ?? "the selected org"}.`,
+>>>>>>> upstream/dev
                       );
                     }}
                     disabled={orgsBusy() || orgs().length === 0}
@@ -843,7 +909,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                     <For each={orgs()}>
                       {(org) => (
                         <option value={org.id}>
-                          {org.name} {org.role === "owner" ? "(Owner)" : "(Member)"}
+                          {org.name} {org.role === "owner" ? t("den.owner_suffix") : t("den.member_suffix")}
                         </option>
                       )}
                     </For>
@@ -874,17 +940,24 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
               <div>
                 <div class="flex items-center gap-2 text-sm font-medium text-dls-text">
                   <Server size={15} class="text-dls-secondary" />
+<<<<<<< HEAD
+                  {t("den.workers_title")}
+=======
                   Cloud workers
+>>>>>>> upstream/dev
                 </div>
                 <div class="mt-1 text-xs text-dls-secondary">
-                  Open workers directly into OpenWork using the same
-                  remote-connect flow the app already uses elsewhere.
+                  {t("den.workers_description")}
                 </div>
               </div>
               <div class="flex flex-wrap items-center gap-2">
                 <div class={sectionPillClass}>
                   <Users size={12} />
+<<<<<<< HEAD
+                  {activeOrg()?.name || t("den.no_org_selected")}
+=======
                   {activeOrgName()}
+>>>>>>> upstream/dev
                 </div>
                 <Button
                   variant="outline"
@@ -893,7 +966,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                   disabled={workersBusy() || !activeOrgId().trim()}
                 >
                   <RefreshCcw size={13} class={workersBusy() ? "animate-spin" : ""} />
-                  Refresh
+                  {t("den.refresh")}
                 </Button>
               </div>
             </div>
@@ -908,8 +981,12 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
 
             <Show when={!workersBusy() && workers().length === 0}>
               <div class={`${settingsPanelSoftClass} border-dashed py-6 text-center text-sm text-dls-secondary`}>
+<<<<<<< HEAD
+                {t("den.no_workers_visible")}
+=======
                 No cloud workers are visible for this org yet. Create one in
                 Cloud, then refresh this tab.
+>>>>>>> upstream/dev
               </div>
             </Show>
 
@@ -930,13 +1007,18 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                             {status().label}
                           </span>
                           <Show when={worker.isMine}>
+<<<<<<< HEAD
+                            <span class="inline-flex items-center rounded-full border border-gray-6/60 bg-gray-1/40 px-2 py-0.5 text-[10px] font-medium text-gray-11">
+                              {t("den.mine_badge")}
+=======
                             <span class={sectionPillClass}>
                               Mine
+>>>>>>> upstream/dev
                             </span>
                           </Show>
                         </div>
                         <div class="mt-0.5 truncate text-[11px] text-dls-secondary">
-                          {worker.provider ? `${worker.provider} worker` : "Cloud worker"}
+                          {worker.provider ? t("den.worker_type").replace("{provider}", worker.provider) : t("den.cloud_worker")}
                           <Show when={worker.instanceUrl}>
                             {(value) => <span> · {value()}</span>}
                           </Show>
@@ -949,9 +1031,9 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
                           void handleOpenWorker(worker.workerId, worker.workerName)
                         }
                         disabled={openingWorkerId() !== null || !status().canOpen}
-                        title={!status().canOpen ? "This worker is not ready to open yet." : undefined}
+                        title={!status().canOpen ? t("den.worker_not_ready_tooltip") : undefined}
                       >
-                        {openingWorkerId() === worker.workerId ? "Opening..." : "Open"}
+                        {openingWorkerId() === worker.workerId ? t("den.opening") : t("den.open")}
                       </Button>
                     </div>
                   );
diff --git a/apps/app/src/app/components/mcp-auth-modal.tsx b/apps/app/src/app/components/mcp-auth-modal.tsx
index 2ffde2846..32bcf7f34 100644
--- a/apps/app/src/app/components/mcp-auth-modal.tsx
+++ b/apps/app/src/app/components/mcp-auth-modal.tsx
@@ -168,7 +168,7 @@ export default function McpAuthModal(props: McpAuthModalProps) {
     statusPoll = window.setInterval(async () => {
       if (Date.now() - startedAt >= MCP_AUTH_TIMEOUT_MS) {
         stopStatusPolling();
-        setError("Request timed out.");
+        setError(translate("mcp.request_timed_out"));
         return;
       }
 
@@ -589,7 +589,7 @@ export default function McpAuthModal(props: McpAuthModalProps) {
     setStatusChecking(false);
   };
 
-  const serverName = () => props.entry?.name ?? "MCP Server";
+  const serverName = () => props.entry?.name ?? translate("mcp.server_fallback");
 
   return (
     <Show when={props.open}>
@@ -694,7 +694,7 @@ export default function McpAuthModal(props: McpAuthModalProps) {
                     <CheckCircle2 size={24} class="text-green-11" />
                   </div>
                   <div>
-                    <p class="text-sm font-medium text-gray-12">Already Connected</p>
+                    <p class="text-sm font-medium text-gray-12">{translate("mcp.already_connected")}</p>
                     <p class="text-xs text-gray-11">
                         {translate("mcp.auth.already_connected_description", { server: serverName() })}
                     </p>
@@ -804,7 +804,7 @@ export default function McpAuthModal(props: McpAuthModalProps) {
                 </div>
                 <div class="rounded-xl border border-gray-6/70 bg-gray-2/40 px-3 py-2 flex items-center gap-3">
                   <div class="flex-1 min-w-0">
-                    <div class="text-[10px] uppercase tracking-wide text-gray-8">Authorization link</div>
+                    <div class="text-[10px] uppercase tracking-wide text-gray-8">{translate("mcp.auth_link_label")}</div>
                     <div class="text-[11px] text-gray-11 font-mono truncate">
                       {authorizationUrl()}
                     </div>
@@ -814,7 +814,7 @@ export default function McpAuthModal(props: McpAuthModalProps) {
                     class="text-xs"
                     onClick={handleCopyAuthorizationUrl}
                   >
-                    {authUrlCopied() ? "Copied" : "Copy link"}
+                    {authUrlCopied() ? translate("mcp.copied") : translate("mcp.copy_link")}
                   </Button>
                 </div>
                 <TextInput
@@ -851,7 +851,7 @@ export default function McpAuthModal(props: McpAuthModalProps) {
                     1
                   </div>
                   <div>
-                    <p class="text-sm font-medium text-gray-12">Opening your browser</p>
+                    <p class="text-sm font-medium text-gray-12">{translate("mcp.step_opening_browser")}</p>
                     <p class="text-xs text-gray-10 mt-1">
                         {translate("mcp.auth.step1_description", { server: serverName() })}
                     </p>
@@ -863,7 +863,7 @@ export default function McpAuthModal(props: McpAuthModalProps) {
                     2
                   </div>
                   <div>
-                    <p class="text-sm font-medium text-gray-12">Authorize OpenWork</p>
+                    <p class="text-sm font-medium text-gray-12">{translate("mcp.step_authorize")}</p>
                     <p class="text-xs text-gray-10 mt-1">
                         {translate("mcp.auth.step2_description")}
                     </p>
@@ -875,7 +875,7 @@ export default function McpAuthModal(props: McpAuthModalProps) {
                     3
                   </div>
                   <div>
-                    <p class="text-sm font-medium text-gray-12">Return here when you're done</p>
+                    <p class="text-sm font-medium text-gray-12">{translate("mcp.step_return")}</p>
                     <p class="text-xs text-gray-10 mt-1">
                         {translate("mcp.auth.step3_description")}
                     </p>
diff --git a/apps/app/src/app/components/mobile-sidebar-drawer.tsx b/apps/app/src/app/components/mobile-sidebar-drawer.tsx
index 74d4b5c77..d7397e986 100644
--- a/apps/app/src/app/components/mobile-sidebar-drawer.tsx
+++ b/apps/app/src/app/components/mobile-sidebar-drawer.tsx
@@ -1,5 +1,6 @@
 import { Show, createEffect, onCleanup } from "solid-js";
 import type { JSX } from "solid-js";
+import { t, currentLocale } from "../../i18n";
 
 type MobileSidebarDrawerProps = {
   open: boolean;
@@ -8,6 +9,7 @@ type MobileSidebarDrawerProps = {
 };
 
 export default function MobileSidebarDrawer(props: MobileSidebarDrawerProps) {
+  const translate = (key: string) => t(key, currentLocale());
   createEffect(() => {
     if (!props.open || typeof window === "undefined" || typeof document === "undefined") return;
 
@@ -35,7 +37,7 @@ export default function MobileSidebarDrawer(props: MobileSidebarDrawerProps) {
           type="button"
           class="absolute inset-0 bg-gray-1/60 backdrop-blur-sm"
           onClick={props.onClose}
-          aria-label="Close sidebar"
+          aria-label={translate("session.close_sidebar")}
         />
         <div class="absolute inset-y-0 right-0 w-[min(360px,calc(100vw-20px))] max-w-full border-l border-dls-border bg-dls-sidebar p-3 shadow-2xl">
           {props.children}
diff --git a/apps/app/src/app/components/model-picker-modal.tsx b/apps/app/src/app/components/model-picker-modal.tsx
index 0ce5df734..e7d10fac0 100644
--- a/apps/app/src/app/components/model-picker-modal.tsx
+++ b/apps/app/src/app/components/model-picker-modal.tsx
@@ -306,9 +306,9 @@ export default function ModelPickerModal(props: ModelPickerModalProps) {
             <span class="truncate">{provider.title}</span>
           </div>
           <div class={`mt-0.5 flex items-center gap-3 text-[11px] ${index === activeIndex() ? 'text-gray-10' : 'text-gray-9 group-hover:text-gray-10'}`}>
-            <span class="truncate">Connect this provider to browse and save models</span>
+            <span class="truncate">{translate("model_picker.connect_provider")}</span>
             <span class="ml-auto opacity-70">
-              {provider.matchCount} {provider.matchCount === 1 ? "model" : "models"}
+              {provider.matchCount} {provider.matchCount === 1 ? translate("model_picker.model_singular") : translate("model_picker.model_plural")}
             </span>
           </div>
         </div>
@@ -324,12 +324,17 @@ export default function ModelPickerModal(props: ModelPickerModalProps) {
             <div class="flex items-start justify-between gap-4">
               <div>
                 <h3 class="text-lg font-semibold text-gray-12">
-                  {props.target === "default" ? "Default model" : "Chat model"}
+                  {props.target === "default" ? translate("model_picker.default_label") : translate("model_picker.chat_label")}
                 </h3>
                 <p class="text-sm text-gray-11 mt-1">
                   {props.target === "default"
+<<<<<<< HEAD
+                    ? translate("model_picker.default_desc")
+                    : translate("model_picker.chat_desc")}
+=======
                     ? "Choose the default model for new chats, then fine-tune reasoning profiles on its card before pressing Done."
                     : "Choose the model for this chat. If a model supports reasoning profiles, configure them on its card."}
+>>>>>>> upstream/dev
                 </p>
               </div>
               <Button
@@ -364,7 +369,7 @@ export default function ModelPickerModal(props: ModelPickerModalProps) {
               <Show when={recommendedOptions().length > 0}>
                 <section class="space-y-2">
                   <div class="px-1 text-[11px] font-semibold uppercase tracking-[0.12em] text-gray-9">
-                    Recommended
+                    {translate("model_picker.recommended")}
                   </div>
                   <For each={recommendedOptions()}>{({ opt, index }) => renderOption(opt, index)}</For>
                 </section>
@@ -373,7 +378,7 @@ export default function ModelPickerModal(props: ModelPickerModalProps) {
               <Show when={otherEnabledOptions().length > 0}>
                 <section class="space-y-2">
                   <div class="px-1 text-[11px] font-semibold uppercase tracking-[0.12em] text-gray-9">
-                    Other connected models
+                    {translate("model_picker.other_connected")}
                   </div>
                   <For each={otherEnabledOptions()}>{({ opt, index }) => renderOption(opt, index)}</For>
                 </section>
@@ -382,7 +387,7 @@ export default function ModelPickerModal(props: ModelPickerModalProps) {
               <Show when={otherOptions().length > 0}>
                 <section class="space-y-2">
                   <div class="px-1 text-[11px] font-semibold uppercase tracking-[0.12em] text-gray-9">
-                    More providers
+                    {translate("model_picker.more_providers")}
                   </div>
                   <For each={otherOptions()}>
                     {(provider) => renderProviderLink(provider, provider.index)}
@@ -392,7 +397,7 @@ export default function ModelPickerModal(props: ModelPickerModalProps) {
 
               <Show when={renderedItems().length === 0}>
                 <div class="rounded-2xl border border-gray-6/70 bg-gray-1/40 px-4 py-6 text-sm text-gray-10">
-                  No models match your search.
+                  {translate("model_picker.no_match")}
                 </div>
               </Show>
             </div>
diff --git a/apps/app/src/app/components/question-modal.tsx b/apps/app/src/app/components/question-modal.tsx
index 4b3b070bd..52a0269d5 100644
--- a/apps/app/src/app/components/question-modal.tsx
+++ b/apps/app/src/app/components/question-modal.tsx
@@ -2,6 +2,7 @@ import { createEffect, createMemo, createSignal, For, onCleanup, Show } from "so
 import type { QuestionInfo } from "@opencode-ai/sdk/v2/client";
 
 import { Check, ChevronRight, HelpCircle } from "lucide-solid";
+import { t, currentLocale } from "../../i18n";
 
 import Button from "./button";
 
@@ -14,6 +15,7 @@ export type QuestionModalProps = {
 };
 
 export default function QuestionModal(props: QuestionModalProps) {
+    const translate = (key: string) => t(key, currentLocale());
     const [currentIndex, setCurrentIndex] = createSignal(0);
     const [answers, setAnswers] = createSignal<string[][]>([]);
     const [currentSelection, setCurrentSelection] = createSignal<string[]>([]);
@@ -138,7 +140,7 @@ export default function QuestionModal(props: QuestionModalProps) {
                             </div>
                             <div>
                                 <h3 class="text-lg font-semibold text-gray-12">
-                                    {currentQuestion()!.header || "Question"}
+                                    {currentQuestion()!.header || translate("question.fallback_header")}
                                 </h3>
                                 <div class="text-xs text-gray-11 font-medium">
                                     Question {currentIndex() + 1} of {props.questions.length}
@@ -186,14 +188,14 @@ export default function QuestionModal(props: QuestionModalProps) {
                         <Show when={currentQuestion()!.custom}>
                             <div class="mt-4 pt-4 border-t border-dls-border">
                                 <label class="block text-xs font-semibold text-dls-secondary mb-2 uppercase tracking-wide">
-                                    Or type a custom answer
+                                    {translate("question.custom_answer_label")}
                                 </label>
                                 <input
                                     type="text"
                                     value={customInput()}
                                     onInput={(e) => setCustomInput(e.currentTarget.value)}
                                     class="w-full px-4 py-3 rounded-xl bg-dls-surface border border-dls-border focus:border-dls-accent focus:ring-4 focus:ring-[rgba(var(--dls-accent-rgb),0.2)] focus:outline-none text-sm text-dls-text placeholder:text-dls-secondary transition-shadow"
-                                    placeholder="Type your answer here..."
+                                    placeholder={translate("question.placeholder")}
                                     onKeyDown={(e) => {
                                         if (e.key === "Enter") {
                                             if (e.isComposing || e.keyCode === 229) return;
@@ -209,15 +211,15 @@ export default function QuestionModal(props: QuestionModalProps) {
                     <div class="p-6 border-t border-dls-border bg-dls-hover flex justify-between items-center">
                         <div class="text-xs text-dls-secondary flex items-center gap-2">
                             <span class="px-1.5 py-0.5 rounded border border-dls-border bg-dls-active font-mono">↑↓</span>
-                            <span>navigate</span>
+                            <span>{translate("question.navigate_hint")}</span>
                             <span class="px-1.5 py-0.5 rounded border border-gray-6 bg-gray-3 font-mono ml-2">↵</span>
-                            <span>select</span>
+                            <span>{translate("question.select_hint")}</span>
                         </div>
 
                         <div class="flex gap-2">
                             <Show when={currentQuestion()?.multiple || currentQuestion()?.custom}>
                                 <Button onClick={handleNext} disabled={!canProceed() || props.busy} class="!px-6">
-                                    {isLastQuestion() ? "Submit" : "Next"}
+                                    {isLastQuestion() ? translate("question.submit") : translate("question.next")}
                                     <Show when={!isLastQuestion()}>
                                         <ChevronRight size={16} class="ml-1 -mr-1 opacity-60" />
                                     </Show>
diff --git a/apps/app/src/app/components/session/composer.tsx b/apps/app/src/app/components/session/composer.tsx
index 0fce9bf94..77657aa72 100644
--- a/apps/app/src/app/components/session/composer.tsx
+++ b/apps/app/src/app/components/session/composer.tsx
@@ -7,6 +7,7 @@ import ComposerNotice, { type ComposerNotice as ComposerNoticeData } from "./com
 
 import type { ComposerAttachment, ComposerDraft, ComposerPart, PromptMode, SlashCommandOption } from "../../types";
 import { perfNow, recordPerfLog } from "../../lib/perf-log";
+import { t, currentLocale } from "../../../i18n";
 
 type MentionOption = {
   id: string;
@@ -440,6 +441,7 @@ const buildRangeFromOffsets = (root: HTMLElement, start: number, end: number) =>
 };
 
 export default function Composer(props: ComposerProps) {
+  const translate = (key: string) => t(key, currentLocale());
   let editorRef: HTMLDivElement | undefined;
   let fileInputRef: HTMLInputElement | undefined;
   let inboxFileInputRef: HTMLInputElement | undefined;
@@ -1529,7 +1531,7 @@ export default function Composer(props: ComposerProps) {
                 <div class="max-h-64 overflow-y-auto bg-dls-surface p-2" onMouseDown={(event: MouseEvent) => event.preventDefault()}>
                   <Show
                     when={mentionVisible().length}
-                    fallback={<div class="px-3 py-2 text-xs text-gray-10">No matches found.</div>}
+                    fallback={<div class="px-3 py-2 text-xs text-gray-10">{translate("session.no_mentions_match")}</div>}
                   >
                     <For each={mentionVisible()}>
                       {(option: MentionOption) => {
@@ -1592,7 +1594,7 @@ export default function Composer(props: ComposerProps) {
                     when={slashFiltered().length}
                     fallback={
                       <div class="px-3 py-2 text-xs text-gray-10">
-                        {slashLoading() ? "Loading commands..." : "No commands found."}
+                        {slashLoading() ? translate("session.loading_commands") : translate("session.no_commands_found")}
                       </div>
                     }
                   >
@@ -1633,6 +1635,20 @@ export default function Composer(props: ComposerProps) {
           </Show>
 
           <div class="p-5 md:p-6">
+<<<<<<< HEAD
+            <Show when={props.showNotionBanner}>
+              <button
+                type="button"
+                class="w-full mb-2 flex items-center justify-between gap-3 rounded-xl border border-green-7/20 bg-green-7/10 px-3 py-2 text-left text-sm text-green-12 transition-colors hover:bg-green-7/15"
+                onClick={props.onNotionBannerClick}
+              >
+                <span>{translate("session.promo_try_it")}</span>
+                <span class="text-xs text-green-12 font-medium">{translate("session.insert_prompt")}</span>
+              </button>
+            </Show>
+
+=======
+>>>>>>> upstream/dev
             <Show when={attachments().length}>
               <div class="mb-3 flex flex-wrap gap-2">
                 <For each={attachments()}>
@@ -1671,14 +1687,33 @@ export default function Composer(props: ComposerProps) {
             </Show>
 
             <div class="relative min-h-[120px]">
+<<<<<<< HEAD
+              <Show when={props.toast}>
+                <div class="absolute bottom-full right-0 mb-2 z-30 rounded-xl border border-gray-6 bg-gray-1 px-3 py-2 text-xs text-gray-11 shadow-lg backdrop-blur-md">
+                  <div class="flex items-center gap-3">
+                    <span>{props.toast}</span>
+                    <Show when={showInboxUploadAction() && props.onUploadInboxFiles}>
+                      <button
+                        type="button"
+                        class="shrink-0 rounded-md border border-gray-6 bg-gray-2 px-2 py-1 text-[10px] text-gray-11 hover:bg-gray-3"
+                        onClick={() => inboxFileInputRef?.click()}
+                      >
+                        {translate("session.upload_shared_folder")}
+                      </button>
+                    </Show>
+                  </div>
+                </div>
+              </Show>
+=======
               <ComposerNotice notice={props.notice} />
+>>>>>>> upstream/dev
 
               <div class="flex flex-col gap-2">
                 <div class="flex-1 min-w-0">
                   <div class="relative">
                     <Show when={!hasDraftContent()}>
                     <div class="absolute left-0 top-0 text-gray-9 text-[15px] leading-relaxed pointer-events-none">
-                        Describe your task...
+                        {translate("session.task_placeholder")}
                     </div>
                   </Show>
                     <div
@@ -1751,10 +1786,10 @@ export default function Composer(props: ComposerProps) {
                                 ? "bg-gray-4 text-gray-10"
                                 : "bg-dls-accent text-white hover:bg-[var(--dls-accent-hover)]"
                                 }`}
-                              title="Run task"
+                              title={translate("session.run_task")}
                             >
                               <ArrowUp size={15} />
-                              <span>Run task</span>
+                              <span>{translate("session.run_task")}</span>
                             </button>
                           }
                         >
@@ -1762,10 +1797,10 @@ export default function Composer(props: ComposerProps) {
                             type="button"
                             onClick={() => props.onStop()}
                             class="inline-flex items-center gap-2 rounded-full bg-gray-12 px-4 py-2 text-[13px] font-medium text-gray-1 transition-colors hover:bg-gray-11"
-                            title="Stop"
+                            title={translate("session.stop")}
                           >
                             <Square size={12} fill="currentColor" />
-                            <span>Stop</span>
+                            <span>{translate("session.stop")}</span>
                           </button>
                         </Show>
                       </div>
@@ -1786,7 +1821,7 @@ export default function Composer(props: ComposerProps) {
                 onClick={props.onToggleAgentPicker}
                 disabled={props.busy}
                 aria-expanded={props.agentPickerOpen}
-                title="Agent"
+                title={translate("session.agent_label")}
               >
                 <span class="max-w-[140px] truncate">{props.agentLabel}</span>
                 <ChevronDown size={13} />
@@ -1795,14 +1830,14 @@ export default function Composer(props: ComposerProps) {
               <Show when={props.agentPickerOpen}>
                 <div class="absolute left-0 bottom-full z-40 mb-2 w-64 overflow-hidden rounded-[18px] border border-dls-border bg-dls-surface shadow-[var(--dls-shell-shadow)]">
                   <div class="border-b border-dls-border px-3 pt-2 pb-1 text-[10px] font-semibold uppercase tracking-[0.2em] text-gray-10">
-                    Agent
+                    {translate("session.agent_label")}
                   </div>
 
                   <div class="p-2 space-y-1 max-h-64 overflow-y-auto" onMouseDown={(event: MouseEvent) => event.preventDefault()}>
                     <Show
                       when={!props.agentPickerBusy}
                       fallback={
-                        <div class="px-3 py-2 text-xs text-gray-10">Loading agents...</div>
+                        <div class="px-3 py-2 text-xs text-gray-10">{translate("session.loading_agents")}</div>
                       }
                     >
                       <Show when={!props.agentPickerError}>
@@ -1817,7 +1852,7 @@ export default function Composer(props: ComposerProps) {
                             props.onSelectAgent(null);
                           }}
                         >
-                          <span>Default agent</span>
+                          <span>{translate("session.default_agent")}</span>
                           <Show when={!props.selectedAgent}>
                             <Check size={14} class="text-gray-10" />
                           </Show>
diff --git a/apps/app/src/app/components/session/context-panel.tsx b/apps/app/src/app/components/session/context-panel.tsx
index 40633ca7f..5683a991f 100644
--- a/apps/app/src/app/components/session/context-panel.tsx
+++ b/apps/app/src/app/components/session/context-panel.tsx
@@ -1,7 +1,11 @@
 import { For, Show } from "solid-js";
 import { ChevronDown, Circle, File, Folder, Package } from "lucide-solid";
 
+<<<<<<< HEAD
+import { t } from "../../../i18n";
+=======
 import { useConnections } from "../../connections/provider";
+>>>>>>> upstream/dev
 import { SUGGESTED_PLUGINS } from "../../constants";
 import type { McpStatus, SkillCard } from "../../types";
 import { stripPluginVersion } from "../../utils/plugins";
@@ -106,19 +110,19 @@ const getSmartFileName = (files: string[], file: string): string => {
 };
 
 const mcpStatusLabel = (status?: McpStatus, disabled?: boolean) => {
-  if (disabled) return "Disabled";
-  if (!status) return "Disconnected";
+  if (disabled) return t("session.ctx_disabled");
+  if (!status) return t("session.ctx_disconnected");
   switch (status.status) {
     case "connected":
-      return "Connected";
+      return t("session.ctx_connected");
     case "needs_auth":
-      return "Needs auth";
+      return t("session.ctx_needs_auth");
     case "needs_client_registration":
-      return "Register client";
+      return t("session.ctx_register_client");
     case "failed":
-      return "Failed";
+      return t("session.ctx_failed");
     default:
-      return "Disconnected";
+      return t("session.ctx_disconnected");
   }
 };
 
@@ -151,7 +155,7 @@ export default function ContextPanel(props: ContextPanelProps) {
             class="w-full px-4 py-3 flex items-center justify-between text-sm text-gray-12 font-medium"
             onClick={() => props.onToggleSection("context")}
           >
-            <span>Context</span>
+            <span>{t("session.ctx_context")}</span>
             <ChevronDown
               size={16}
               class={`transition-transform text-gray-10 ${props.expandedSections.context ? "rotate-180" : ""}`.trim()}
@@ -161,12 +165,12 @@ export default function ContextPanel(props: ContextPanelProps) {
             <div class="px-4 pb-4 pt-1 space-y-5">
               <div>
                 <div class="flex items-center justify-between text-[11px] uppercase tracking-wider text-gray-9 font-semibold mb-2">
-                  <span>Working files</span>
+                  <span>{t("session.ctx_working_files")}</span>
                 </div>
                 <div class="space-y-2">
                   <Show
                     when={props.workingFiles.length}
-                    fallback={<div class="text-xs text-gray-9">None yet.</div>}
+                    fallback={<div class="text-xs text-gray-9">{t("session.ctx_none_yet")}</div>}
                   >
                     <For each={props.workingFiles}>
                       {(file) => {
@@ -203,7 +207,7 @@ export default function ContextPanel(props: ContextPanelProps) {
             class="w-full px-4 py-3 flex items-center justify-between text-sm text-gray-12 font-medium"
             onClick={() => props.onToggleSection("plugins")}
           >
-            <span>Plugins</span>
+            <span>{t("session.ctx_plugins")}</span>
             <ChevronDown
               size={16}
               class={`transition-transform text-gray-10 ${props.expandedSections.plugins ? "rotate-180" : ""}`.trim()}
@@ -216,7 +220,7 @@ export default function ContextPanel(props: ContextPanelProps) {
                   when={props.activePlugins.length}
                   fallback={
                     <div class="text-xs text-gray-9">
-                      {props.activePluginStatus ?? "No plugins loaded."}
+                      {props.activePluginStatus ?? t("session.ctx_no_plugins")}
                     </div>
                   }
                 >
@@ -253,7 +257,7 @@ export default function ContextPanel(props: ContextPanelProps) {
             class="w-full px-4 py-3 flex items-center justify-between text-sm text-gray-12 font-medium"
             onClick={() => props.onToggleSection("mcp")}
           >
-            <span>MCP</span>
+            <span>{t("session.ctx_mcp")}</span>
             <ChevronDown
               size={16}
               class={`transition-transform text-gray-10 ${props.expandedSections.mcp ? "rotate-180" : ""}`.trim()}
@@ -266,7 +270,11 @@ export default function ContextPanel(props: ContextPanelProps) {
                   when={connections.mcpServers().length}
                   fallback={
                     <div class="text-xs text-gray-9">
+<<<<<<< HEAD
+                      {props.mcpStatus ?? t("session.ctx_no_mcp")}
+=======
                       {connections.mcpStatus() ?? "No MCP servers loaded."}
+>>>>>>> upstream/dev
                     </div>
                   }
                 >
@@ -303,7 +311,7 @@ export default function ContextPanel(props: ContextPanelProps) {
             class="w-full px-4 py-3 flex items-center justify-between text-sm text-gray-12 font-medium"
             onClick={() => props.onToggleSection("skills")}
           >
-            <span>Skills</span>
+            <span>{t("session.ctx_skills")}</span>
             <ChevronDown
               size={16}
               class={`transition-transform text-gray-10 ${props.expandedSections.skills ? "rotate-180" : ""}`.trim()}
@@ -316,7 +324,7 @@ export default function ContextPanel(props: ContextPanelProps) {
                   when={props.skills.length}
                   fallback={
                     <div class="text-xs text-gray-9">
-                      {props.skillsStatus ?? "No skills loaded."}
+                      {props.skillsStatus ?? t("session.ctx_no_skills")}
                     </div>
                   }
                 >
@@ -352,7 +360,7 @@ export default function ContextPanel(props: ContextPanelProps) {
             class="w-full px-4 py-3 flex items-center justify-between text-sm text-gray-12 font-medium"
             onClick={() => props.onToggleSection("authorizedFolders")}
           >
-            <span>Authorized folders</span>
+            <span>{t("session.ctx_authorized_folders")}</span>
             <ChevronDown
               size={16}
               class={`transition-transform text-gray-10 ${
@@ -365,7 +373,7 @@ export default function ContextPanel(props: ContextPanelProps) {
               <div class="space-y-2">
                 <Show
                   when={props.authorizedDirs.length}
-                  fallback={<div class="text-xs text-gray-9">None yet.</div>}
+                  fallback={<div class="text-xs text-gray-9">{t("session.ctx_none_yet")}</div>}
                 >
                   <For each={props.authorizedDirs.slice(0, 3)}>
                     {(folder) => (
diff --git a/apps/app/src/app/components/session/inbox-panel.tsx b/apps/app/src/app/components/session/inbox-panel.tsx
index 0d6b51ef8..48fe44e52 100644
--- a/apps/app/src/app/components/session/inbox-panel.tsx
+++ b/apps/app/src/app/components/session/inbox-panel.tsx
@@ -1,6 +1,7 @@
 import { For, Show, createEffect, createMemo, createSignal } from "solid-js";
 import { Download, RefreshCw, UploadCloud } from "lucide-solid";
 
+import { t } from "../../../i18n";
 import { getOpenWorkDeployment } from "../../lib/openwork-deployment";
 import type { OpenworkInboxItem, OpenworkServerClient } from "../../lib/openwork-server";
 import WebUnavailableSurface from "../web-unavailable-surface";
@@ -48,7 +49,7 @@ export default function InboxPanel(props: InboxPanelProps) {
   });
 
   const connected = createMemo(() => Boolean(props.client && (props.workspaceId ?? "").trim()));
-  const helperText = "Share files with this worker from the app.";
+  const helperText = t("session.inbox_share_hint");
 
   const visibleItems = createMemo(() => (items() ?? []).slice(0, maxPreview()));
   const hiddenCount = createMemo(() => Math.max(0, (items() ?? []).length - visibleItems().length));
@@ -72,7 +73,7 @@ export default function InboxPanel(props: InboxPanelProps) {
       setItems(result.items ?? []);
     } catch (err) {
       const message =
-        err instanceof Error ? err.message : "Failed to load shared folder";
+        err instanceof Error ? err.message : t("session.inbox_load_failed");
       setError(message);
       setItems([]);
     } finally {
@@ -84,7 +85,7 @@ export default function InboxPanel(props: InboxPanelProps) {
     const client = props.client;
     const workspaceId = (props.workspaceId ?? "").trim();
     if (!client || !workspaceId) {
-      toast("Connect to a worker to upload files to the shared folder.");
+      toast(t("session.inbox_connect_to_upload"));
       return;
     }
     if (!files.length) return;
@@ -93,15 +94,15 @@ export default function InboxPanel(props: InboxPanelProps) {
     setError(null);
     try {
       const label = files.length === 1 ? files[0]?.name ?? "file" : `${files.length} files`;
-      toast(`Uploading ${label}...`);
+      toast(t("session.inbox_uploading").replace("{label}", label));
       for (const file of files) {
         await client.uploadInbox(workspaceId, file);
       }
-      toast("Uploaded to the shared folder.");
+      toast(t("session.inbox_uploaded"));
       await refresh();
     } catch (err) {
       const message =
-        err instanceof Error ? err.message : "Shared folder upload failed";
+        err instanceof Error ? err.message : t("session.inbox_upload_failed");
       setError(message);
       toast(message);
     } finally {
@@ -115,7 +116,7 @@ export default function InboxPanel(props: InboxPanelProps) {
       await navigator.clipboard.writeText(path);
       toast(`Copied: ${path}`);
     } catch {
-      toast("Copy failed. Your browser may block clipboard access.");
+      toast(t("session.inbox_copy_failed"));
     }
   };
 
@@ -123,12 +124,12 @@ export default function InboxPanel(props: InboxPanelProps) {
     const client = props.client;
     const workspaceId = (props.workspaceId ?? "").trim();
     if (!client || !workspaceId) {
-      toast("Connect to a worker to download shared files.");
+      toast(t("session.inbox_connect_to_download"));
       return;
     }
     const id = String(item.id ?? "").trim();
     if (!id) {
-      toast("Missing shared file id.");
+      toast(t("session.inbox_missing_file_id"));
       return;
     }
 
@@ -144,7 +145,7 @@ export default function InboxPanel(props: InboxPanelProps) {
       a.remove();
       URL.revokeObjectURL(url);
     } catch (err) {
-      const message = err instanceof Error ? err.message : "Download failed";
+      const message = err instanceof Error ? err.message : t("session.inbox_download_failed");
       toast(message);
     }
   };
@@ -160,7 +161,7 @@ export default function InboxPanel(props: InboxPanelProps) {
     <WebUnavailableSurface unavailable={webDeployment()} compact>
       <div id={props.id}>
         <div class="flex items-center justify-between px-2 mb-3">
-          <span class="text-[11px] font-semibold uppercase tracking-wider text-gray-10">Shared folder</span>
+          <span class="text-[11px] font-semibold uppercase tracking-wider text-gray-10">{t("session.inbox_shared_folder")}</span>
           <div class="flex items-center gap-2">
             <Show when={(items() ?? []).length > 0}>
               <span class="text-[11px] font-medium bg-gray-4/60 text-gray-10 px-1.5 rounded">
@@ -171,8 +172,8 @@ export default function InboxPanel(props: InboxPanelProps) {
               type="button"
               class="rounded-md p-1 text-gray-9 hover:text-gray-11 hover:bg-gray-3 transition-colors"
               onClick={() => void refresh()}
-              title="Refresh shared folder"
-              aria-label="Refresh shared folder"
+              title={t("session.inbox_refresh")}
+              aria-label={t("session.inbox_refresh")}
               disabled={!connected() || loading()}
             >
               <RefreshCw size={14} class={loading() ? "animate-spin" : ""} />
@@ -214,12 +215,12 @@ export default function InboxPanel(props: InboxPanelProps) {
             if (files.length) void uploadFiles(files);
           }}
           disabled={uploading()}
-             title={connected() ? "Drop files here to upload" : "Connect to a worker to upload"}
+             title={connected() ? t("session.inbox_drop_to_upload") : t("session.inbox_connect_upload")}
           >
           <div class="flex flex-col items-center justify-center text-center">
             <UploadCloud size={18} class="text-gray-9 mb-2" />
             <span class="text-[13px] font-medium text-gray-11">
-              {uploading() ? "Uploading..." : "Drop files or click to upload"}
+              {uploading() ? t("session.inbox_uploading_label") : t("session.inbox_drop_or_click")}
             </span>
             <span class="mt-0.5 text-[11px] text-gray-9">{helperText}</span>
           </div>
@@ -234,8 +235,8 @@ export default function InboxPanel(props: InboxPanelProps) {
             when={visibleItems().length > 0}
             fallback={
               <div class="text-xs text-gray-10 px-1 py-1">
-                <Show when={connected()} fallback={"Connect to see shared files."}>
-                  No shared files yet.
+                <Show when={connected()} fallback={t("session.inbox_connect_to_see")}>
+                  {t("session.inbox_no_files")}
                 </Show>
               </div>
             }
@@ -253,8 +254,8 @@ export default function InboxPanel(props: InboxPanelProps) {
                       type="button"
                       class="min-w-0 flex-1 text-left"
                       onClick={() => void copyPath(item)}
-                      title={rel() ? `Copy ${INBOX_PREFIX}${rel()}` : "Copy shared folder path"}
-                      aria-label={rel() ? `Copy ${INBOX_PREFIX}${rel()}` : "Copy shared folder path"}
+                      title={rel() ? `${t("session.inbox_copy_path")}: ${INBOX_PREFIX}${rel()}` : t("session.inbox_copy_path")}
+                      aria-label={rel() ? `${t("session.inbox_copy_path")}: ${INBOX_PREFIX}${rel()}` : t("session.inbox_copy_path")}
                       disabled={!connected()}
                     >
                       <div class="truncate text-xs font-medium text-gray-11">{name()}</div>
@@ -275,8 +276,8 @@ export default function InboxPanel(props: InboxPanelProps) {
                       type="button"
                       class="shrink-0 rounded-md p-1 text-gray-9 opacity-0 group-hover:opacity-100 hover:text-gray-11 hover:bg-gray-3"
                       onClick={() => void downloadItem(item)}
-                      title="Download"
-                      aria-label="Download"
+                      title={t("session.inbox_download")}
+                      aria-label={t("session.inbox_download")}
                       disabled={!connected()}
                     >
                       <Download size={14} />
@@ -288,7 +289,7 @@ export default function InboxPanel(props: InboxPanelProps) {
           </Show>
 
           <Show when={hiddenCount() > 0}>
-            <div class="text-[11px] text-gray-10 px-1 py-1">Showing first {maxPreview()}.</div>
+            <div class="text-[11px] text-gray-10 px-1 py-1">{t("session.inbox_showing_first").replace("{count}", String(maxPreview()))}</div>
           </Show>
         </div>
       </div>
diff --git a/apps/app/src/app/components/session/message-list.tsx b/apps/app/src/app/components/session/message-list.tsx
index 4c3605304..f4158384e 100644
--- a/apps/app/src/app/components/session/message-list.tsx
+++ b/apps/app/src/app/components/session/message-list.tsx
@@ -31,6 +31,7 @@ import {
 } from "../../utils";
 import PartView from "../part-view";
 import { perfNow, recordPerfLog } from "../../lib/perf-log";
+import { t } from "../../../i18n";
 
 export type MessageListProps = {
   messages: MessageWithParts[];
@@ -228,57 +229,57 @@ function toolHeadline(part: Part) {
     const description = pick("description");
     if (description) return compactText(description);
     const command = pick("command", "cmd");
-    return command ? compactText(`Run ${command}`, 48) : "Run command";
+    return command ? compactText(t("session.tool_run_command").replace("{cmd}", command), 48) : t("session.tool_run_command_fallback");
   }
 
   if (tool === "read") {
     const file = target("filePath", "path", "file");
-    return file ? `Reviewed ${file}` : "Reviewed file";
+    return file ? t("session.tool_reviewed_file").replace("{file}", file) : t("session.tool_reviewed_file_fallback");
   }
 
   if (tool === "edit") {
     const file = target("filePath", "path", "file");
-    return file ? `Updated ${file}` : "Updated file";
+    return file ? t("session.tool_updated_file").replace("{file}", file) : t("session.tool_updated_file_fallback");
   }
 
   if (tool === "write" || tool === "apply_patch") {
     const file = target("filePath", "path", "file");
-    return file ? `Update ${file}` : "Update file";
+    return file ? t("session.tool_update_file").replace("{file}", file) : t("session.tool_update_file_fallback");
   }
 
   if (tool === "grep" || tool === "glob" || tool === "search") {
     const pattern = pick("pattern", "query");
-    return pattern ? `Searched ${compactText(pattern, 36)}` : "Searched code";
+    return pattern ? t("session.tool_searched").replace("{pattern}", compactText(pattern, 36)) : t("session.tool_searched_fallback");
   }
 
   if (tool === "list" || tool === "list_files") {
     const path = target("path");
-    return path ? `Reviewed ${path}` : "Reviewed files";
+    return path ? t("session.tool_reviewed_files").replace("{path}", path) : t("session.tool_reviewed_files_fallback");
   }
 
   if (tool === "task") {
     const description = pick("description");
     if (description) return compactText(description);
     const agent = pick("subagent_type");
-    return agent ? `Delegate ${agent}` : "Delegate task";
+    return agent ? t("session.tool_delegate").replace("{agent}", agent) : t("session.tool_delegate_fallback");
   }
 
   if (tool === "todowrite") {
-    return "Update todo list";
+    return t("session.tool_update_todo");
   }
 
   if (tool === "todoread") {
-    return "Read todo list";
+    return t("session.tool_read_todo");
   }
 
   if (tool === "webfetch") {
     const url = pick("url");
-    return url ? `Checked ${compactText(url, 36)}` : "Checked web page";
+    return url ? t("session.tool_checked_url").replace("{url}", compactText(url, 36)) : t("session.tool_checked_url_fallback");
   }
 
   if (tool === "skill") {
     const name = pick("name");
-    return name ? `Load skill ${name}` : "Load skill";
+    return name ? t("session.tool_load_skill").replace("{name}", name) : t("session.tool_load_skill_fallback");
   }
 
   const fallback = tool
@@ -697,16 +698,16 @@ export default function MessageList(props: MessageListProps) {
       if (title) return title;
       if (task().description) return task().description!;
       if (task().agentType) return `${task().agentType} task`;
-      return "Subagent session";
+      return t("session.subagent_session");
     });
     const statusLabel = createMemo(() => {
-      if (loading()) return "Loading transcript";
-      if (streaming()) return "Running";
+      if (loading()) return t("session.loading_transcript");
+      if (streaming()) return t("session.subagent_running");
       if (childMessages().length > 0) {
         const count = childMessages().length;
         return `${count} message${count === 1 ? "" : "s"}`;
       }
-      return "Waiting for transcript";
+      return t("session.waiting_transcript");
     });
 
     createEffect(() => {
@@ -754,7 +755,7 @@ export default function MessageList(props: MessageListProps) {
             <div class="mt-3 rounded-[18px] border border-dls-border/70 bg-dls-surface px-3 py-3">
               <Show
                 when={childMessages().length > 0}
-                fallback={<div class="text-[12px] leading-5 text-gray-9">Waiting for the subagent transcript to arrive.</div>}
+                fallback={<div class="text-[12px] leading-5 text-gray-9">{t("session.waiting_subagent")}</div>}
               >
                 <MessageList
                   messages={childMessages()}
@@ -855,13 +856,13 @@ export default function MessageList(props: MessageListProps) {
           <div class="mt-3 ml-[22px] space-y-3">
             <Show when={hasStructuredValue(toolInput())}>
               <div>
-                <div class="mb-1 text-[11px] font-medium uppercase tracking-[0.12em] text-gray-8">Request</div>
+                <div class="mb-1 text-[11px] font-medium uppercase tracking-[0.12em] text-gray-8">{t("session.request_label")}</div>
                 <pre class="overflow-x-auto rounded-[16px] border border-dls-border/70 bg-dls-surface px-4 py-3 text-[12px] leading-6 text-gray-10">{formatStructuredValue(toolInput())}</pre>
               </div>
             </Show>
             <Show when={hasStructuredValue(toolOutput())}>
               <div>
-                <div class="mb-1 text-[11px] font-medium uppercase tracking-[0.12em] text-gray-8">Result</div>
+                <div class="mb-1 text-[11px] font-medium uppercase tracking-[0.12em] text-gray-8">{t("session.result_label")}</div>
                 <pre class="overflow-x-auto rounded-[16px] border border-dls-border/70 bg-dls-surface px-4 py-3 text-[12px] leading-6 text-gray-10">{formatStructuredValue(toolOutput())}</pre>
               </div>
             </Show>
diff --git a/apps/app/src/app/components/session/sidebar.tsx b/apps/app/src/app/components/session/sidebar.tsx
index 639cc22b5..a007d7ef7 100644
--- a/apps/app/src/app/components/session/sidebar.tsx
+++ b/apps/app/src/app/components/session/sidebar.tsx
@@ -3,6 +3,7 @@ import { Check, ChevronDown, GripVertical, Loader2, Plus, RefreshCcw, Settings,
 
 import type { TodoItem, WorkspaceConnectionState } from "../../types";
 import type { WorkspaceInfo } from "../../lib/tauri";
+import { t } from "../../../i18n";
 
 type SessionSummary = {
   id: string;
@@ -266,21 +267,21 @@ export default function SessionSidebar(props: SidebarProps) {
           disabled={props.newTaskDisabled}
         >
           <Plus size={16} />
-          New task
+          {t("session.sidebar_new_task")}
         </button>
       </div>
 
       <div class="flex-1 overflow-y-auto px-4 py-4 space-y-6">
         <div>
           <div class="flex items-center justify-between px-2 mb-2">
-            <div class="text-xs text-gray-10 font-semibold uppercase tracking-wider">Workspaces</div>
+            <div class="text-xs text-gray-10 font-semibold uppercase tracking-wider">{t("session.sidebar_workspaces")}</div>
           </div>
           <div class="space-y-4">
             <Show
               when={props.workspaceGroups.length > 0}
               fallback={
                 <div class="px-3 py-2 rounded-lg border border-dashed border-gray-6 text-xs text-gray-9">
-                  No workspaces in this session yet. Add one to get started.
+                  {t("session.sidebar_no_workspaces")}
                 </div>
               }
             >
@@ -356,7 +357,7 @@ export default function SessionSidebar(props: SidebarProps) {
                                 </span>
                                 <Show when={group.workspace.workspaceType === "remote"}>
                                   <span class="text-[9px] uppercase tracking-wide px-1.5 py-0.5 rounded-full bg-gray-3 text-gray-11">
-                                    {isSandboxWorkspace() ? "Sandbox" : "Remote"}
+                                    {isSandboxWorkspace() ? t("session.sidebar_sandbox") : t("session.sidebar_remote")}
                                   </span>
                                 </Show>
                               </div>
@@ -373,11 +374,11 @@ export default function SessionSidebar(props: SidebarProps) {
                               </Show>
                               <Show when={!isConnecting() && connectionStatus() !== "connecting"}>
                                 <Show when={connectionStatus() === "error"}>
-                                  <span class="text-red-11 font-medium">Needs attention</span>
+                                  <span class="text-red-11 font-medium">{t("session.sidebar_needs_attention")}</span>
                                 </Show>
                                 <Show when={connectionStatus() !== "error"}>
-                                  <Show when={isActive()} fallback={<span class="text-gray-9">Switch</span>}>
-                                    <span class="text-green-11 font-medium">Active</span>
+                                  <Show when={isActive()} fallback={<span class="text-gray-9">{t("session.sidebar_switch")}</span>}>
+                                    <span class="text-green-11 font-medium">{t("session.sidebar_active")}</span>
                                   </Show>
                                 </Show>
                               </Show>
@@ -389,7 +390,7 @@ export default function SessionSidebar(props: SidebarProps) {
                             type="button"
                             class="p-1 rounded-md text-gray-9 hover:text-gray-12 hover:bg-gray-2"
                             onClick={() => toggleWorkspaceCollapse(group.workspace.id)}
-                            title={collapsed() ? "Expand" : "Collapse"}
+                            title={collapsed() ? t("session.sidebar_expand") : t("session.sidebar_collapse")}
                           >
                             <ChevronDown
                               size={14}
@@ -399,7 +400,7 @@ export default function SessionSidebar(props: SidebarProps) {
                           <button
                             type="button"
                             class="p-1 rounded-md text-gray-9 hover:text-gray-12 hover:bg-gray-2 cursor-grab"
-                            title="Drag to reorder"
+                            title={t("session.sidebar_drag_reorder")}
                             draggable
                             onDragStart={(event) => handleDragStart(event, group.workspace.id)}
                             onDragEnd={handleDragEnd}
@@ -424,7 +425,7 @@ export default function SessionSidebar(props: SidebarProps) {
                                 disabled={isActivelyConnecting()}
                               >
                                 <Settings size={12} />
-                                Edit connection
+                                {t("session.sidebar_edit_connection")}
                               </button>
                               <button
                                 type="button"
@@ -433,7 +434,7 @@ export default function SessionSidebar(props: SidebarProps) {
                                 disabled={isActivelyConnecting()}
                               >
                                 <RefreshCcw size={12} class={connectionStatus() === "connecting" ? "animate-spin" : ""} />
-                                Test connection
+                                {t("session.sidebar_test_connection")}
                               </button>
                             </Show>
                             <Show when={group.workspace.sandboxContainerName?.trim() && props.onStopSandbox}>
@@ -444,7 +445,7 @@ export default function SessionSidebar(props: SidebarProps) {
                                 disabled={isActivelyConnecting()}
                               >
                                 <Square size={12} />
-                                Stop sandbox
+                                {t("session.sidebar_stop_sandbox")}
                               </button>
                             </Show>
                             <button
@@ -454,14 +455,14 @@ export default function SessionSidebar(props: SidebarProps) {
                               disabled={isActivelyConnecting()}
                             >
                               <Trash2 size={12} />
-                              Remove
+                              {t("session.sidebar_remove")}
                             </button>
                           </div>
                           <Show
                             when={sessions().length > 0}
                             fallback={
                               <div class="px-3 py-2 rounded-lg border border-dashed border-gray-6 text-xs text-gray-9">
-                                No sessions yet.
+                                {t("session.sidebar_no_sessions")}
                               </div>
                             }
                           >
@@ -520,8 +521,8 @@ export default function SessionSidebar(props: SidebarProps) {
                                 onClick={() => toggleShowAllSessions(group.workspace.id)}
                               >
                                 {showingAll()
-                                  ? "Show fewer"
-                                  : `Show ${sessions().length - MAX_SESSIONS_PREVIEW} more`}
+                                  ? t("session.sidebar_show_fewer")
+                                  : t("session.sidebar_show_more").replace("{count}", String(sessions().length - MAX_SESSIONS_PREVIEW))}
                               </button>
                             </Show>
                           </Show>
@@ -542,8 +543,51 @@ export default function SessionSidebar(props: SidebarProps) {
                 onDrop={(event) => handleDrop(event, null)}
               >
                 <Plus size={14} />
+<<<<<<< HEAD
+                {t("session.sidebar_add_workspace")}
+              </button>
+              <Show when={addWorkspaceMenuOpen()}>
+                <div class="mt-2 rounded-lg border border-gray-6 bg-gray-1 shadow-lg overflow-hidden">
+                  <button
+                    type="button"
+                    class="w-full flex items-center gap-2 px-3 py-2 text-xs text-gray-11 hover:bg-gray-2 transition-colors"
+                    onClick={() => {
+                      props.onCreateWorkspace();
+                      setAddWorkspaceMenuOpen(false);
+                    }}
+                  >
+                    <Plus size={12} />
+                    {t("session.sidebar_new_worker")}
+                  </button>
+                  <button
+                    type="button"
+                    class="w-full flex items-center gap-2 px-3 py-2 text-xs text-gray-11 hover:bg-gray-2 transition-colors"
+                    onClick={() => {
+                      props.onCreateRemoteWorkspace();
+                      setAddWorkspaceMenuOpen(false);
+                    }}
+                  >
+                    <Plus size={12} />
+                    {t("session.sidebar_connect_remote")}
+                  </button>
+                  <button
+                    type="button"
+                    class="w-full flex items-center gap-2 px-3 py-2 text-xs text-gray-11 hover:bg-gray-2 transition-colors disabled:opacity-60"
+                    disabled={props.importingWorkspaceConfig}
+                    onClick={() => {
+                      props.onImportWorkspace();
+                      setAddWorkspaceMenuOpen(false);
+                    }}
+                  >
+                    <Plus size={12} />
+                    {t("session.sidebar_import_config")}
+                  </button>
+                </div>
+              </Show>
+=======
                 Add workspace
               </button>
+>>>>>>> upstream/dev
             </div>
           </div>
         </div>
@@ -555,7 +599,7 @@ export default function SessionSidebar(props: SidebarProps) {
                 class="w-full px-4 py-3 flex items-center justify-between text-sm text-gray-12 font-medium"
                 onClick={() => props.onToggleSection("progress")}
               >
-                <span>Progress</span>
+                <span>{t("session.sidebar_progress")}</span>
                 <ChevronDown
                   size={16}
                   class={`transition-transform text-gray-10 ${
@@ -614,7 +658,7 @@ export default function SessionSidebar(props: SidebarProps) {
                   closeContextMenu();
                 }}
               >
-                New task
+                {t("session.sidebar_new_task_menu")}
               </button>
               <button
                 class="w-full text-left px-3 py-2 text-sm rounded-lg text-red-11 hover:bg-red-1/40 transition-colors"
@@ -624,7 +668,7 @@ export default function SessionSidebar(props: SidebarProps) {
                   closeContextMenu();
                 }}
               >
-                Delete session
+                {t("session.sidebar_delete_session")}
               </button>
             </div>
           </div>
diff --git a/apps/app/src/app/components/session/workspace-session-list.tsx b/apps/app/src/app/components/session/workspace-session-list.tsx
index 0851ac42e..d375964f0 100644
--- a/apps/app/src/app/components/session/workspace-session-list.tsx
+++ b/apps/app/src/app/components/session/workspace-session-list.tsx
@@ -25,6 +25,7 @@ import {
   getWorkspaceTaskLoadErrorDisplay,
   isWindowsPlatform,
 } from "../../utils";
+import { t } from "../../../i18n";
 
 type Props = {
   workspaceSessionGroups: WorkspaceSessionGroup[];
@@ -159,16 +160,16 @@ const workspaceLabel = (workspace: WorkspaceInfo) =>
   workspace.openworkWorkspaceName?.trim() ||
   workspace.name?.trim() ||
   workspace.path?.trim() ||
-  "Workspace";
+  t("session.workspace_default");
 
 const workspaceKindLabel = (workspace: WorkspaceInfo) =>
   workspace.workspaceType === "remote"
     ? workspace.sandboxBackend === "docker" ||
       Boolean(workspace.sandboxRunId?.trim()) ||
       Boolean(workspace.sandboxContainerName?.trim())
-      ? "Sandbox"
-      : "Remote"
-    : "Local";
+      ? t("session.kind_sandbox")
+      : t("session.kind_remote")
+    : t("session.kind_local");
 
 const WORKSPACE_SWATCHES = ["#2563eb", "#5a67d8", "#f97316", "#10b981"];
 
@@ -184,8 +185,14 @@ const workspaceSwatchColor = (seed: string) => {
 
 export default function WorkspaceSessionList(props: Props) {
   const revealLabel = isWindowsPlatform()
+<<<<<<< HEAD
+    ? t("session.reveal_explorer")
+    : t("session.reveal_finder");
+  const newWorkspaceDesktopOnly = getOpenWorkDeployment() === "web";
+=======
     ? "Reveal in Explorer"
     : "Reveal in Finder";
+>>>>>>> upstream/dev
   const [expandedWorkspaceIds, setExpandedWorkspaceIds] = createSignal<
     Set<string>
   >(new Set());
@@ -286,7 +293,7 @@ export default function WorkspaceSessionList(props: Props) {
   const showMoreLabel = (workspaceId: string, totalRoots: number) => {
     const remaining = Math.max(0, totalRoots - previewCount(workspaceId));
     const nextCount = Math.min(MAX_SESSIONS_PREVIEW, remaining);
-    return nextCount > 0 ? `Show ${nextCount} more` : "Show more";
+    return nextCount > 0 ? t("session.show_more").replace("{count}", String(nextCount)) : t("session.show_more_generic");
   };
 
   createEffect(() => {
@@ -380,7 +387,7 @@ export default function WorkspaceSessionList(props: Props) {
               <button
                 type="button"
                 class="-ml-1 flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-gray-9 transition-colors hover:bg-gray-3/80 hover:text-gray-11"
-                aria-label={isExpanded() ? "Hide child sessions" : "Show child sessions"}
+                aria-label={isExpanded() ? t("session.hide_child_sessions") : t("session.show_child_sessions")}
                 onClick={(event) => {
                   event.preventDefault();
                   event.stopPropagation();
@@ -410,7 +417,7 @@ export default function WorkspaceSessionList(props: Props) {
               <button
                 type="button"
                 class="flex h-7 w-7 items-center justify-center rounded-md text-gray-9 transition-colors hover:bg-gray-3/80 hover:text-gray-11"
-                aria-label="Session actions"
+                aria-label={t("session.session_actions")}
                 onClick={(event) => {
                   event.preventDefault();
                   event.stopPropagation();
@@ -438,7 +445,7 @@ export default function WorkspaceSessionList(props: Props) {
                   props.onOpenRenameSession?.();
                 }}
               >
-                Rename session
+                {t("session.rename_session")}
               </button>
             </Show>
 
@@ -451,7 +458,7 @@ export default function WorkspaceSessionList(props: Props) {
                   props.onOpenDeleteSession?.();
                 }}
               >
-                Delete session
+                {t("session.delete_session")}
               </button>
             </Show>
           </div>
@@ -493,9 +500,13 @@ export default function WorkspaceSessionList(props: Props) {
               getWorkspaceTaskLoadErrorDisplay(workspace(), group.error);
             const statusLabel = () => {
               if (group.status === "error") return taskLoadError().label;
-              if (isConnectionActionBusy()) return "Connecting";
+              if (isConnectionActionBusy()) return t("session.status_connecting");
               if (!props.developerMode) return "";
+<<<<<<< HEAD
+              if (props.activeWorkspaceId === workspace().id) return t("session.status_active");
+=======
               if (props.selectedWorkspaceId === workspace().id) return "Selected";
+>>>>>>> upstream/dev
               return workspaceKindLabel(workspace());
             };
             const statusTone = () => {
@@ -569,7 +580,7 @@ export default function WorkspaceSessionList(props: Props) {
                             props.onCreateTaskInWorkspace(workspace().id);
                           }}
                           disabled={props.newTaskDisabled}
-                          aria-label="New task"
+                          aria-label={t("session.new_task_label")}
                         >
                           <Plus size={14} />
                         </button>
@@ -585,7 +596,7 @@ export default function WorkspaceSessionList(props: Props) {
                                 : workspace().id,
                             );
                           }}
-                          aria-label="Workspace options"
+                          aria-label={t("session.workspace_options")}
                         >
                           <MoreHorizontal size={14} />
                         </button>
@@ -596,8 +607,8 @@ export default function WorkspaceSessionList(props: Props) {
                         class="rounded-md p-1 text-gray-9 hover:bg-gray-3/80 hover:text-gray-11"
                         aria-label={
                           isWorkspaceExpanded(workspace().id)
-                            ? "Collapse"
-                            : "Expand"
+                            ? t("session.collapse")
+                            : t("session.expand")
                         }
                         onClick={(event) => {
                           event.stopPropagation();
@@ -628,7 +639,7 @@ export default function WorkspaceSessionList(props: Props) {
                           setWorkspaceMenuId(null);
                         }}
                       >
-                        Edit name
+                        {t("session.edit_name")}
                       </button>
                       <button
                         type="button"
@@ -638,7 +649,7 @@ export default function WorkspaceSessionList(props: Props) {
                           setWorkspaceMenuId(null);
                         }}
                       >
-                        Share...
+                        {t("session.share")}
                       </button>
                       <Show when={workspace().workspaceType === "local"}>
                         <button
@@ -665,7 +676,7 @@ export default function WorkspaceSessionList(props: Props) {
                             }}
                             disabled={isConnectionActionBusy()}
                           >
-                            Recover
+                            {t("session.recover")}
                           </button>
                         </Show>
                         <button
@@ -679,7 +690,7 @@ export default function WorkspaceSessionList(props: Props) {
                           }}
                           disabled={isConnectionActionBusy()}
                         >
-                          Test connection
+                          {t("session.test_connection")}
                         </button>
                         <button
                           type="button"
@@ -690,7 +701,7 @@ export default function WorkspaceSessionList(props: Props) {
                           }}
                           disabled={isConnectionActionBusy()}
                         >
-                          Edit connection
+                          {t("session.edit_connection")}
                         </button>
                       </Show>
                       <button
@@ -701,7 +712,7 @@ export default function WorkspaceSessionList(props: Props) {
                           setWorkspaceMenuId(null);
                         }}
                       >
-                        Remove workspace
+                        {t("session.remove_workspace")}
                       </button>
                     </div>
                   </Show>
@@ -810,10 +821,10 @@ export default function WorkspaceSessionList(props: Props) {
                               disabled={props.newTaskDisabled}
                             >
                               <span class="group-hover/empty:hidden">
-                                No tasks yet.
+                                {t("session.no_tasks_yet")}
                               </span>
                               <span class="hidden group-hover/empty:inline font-medium">
-                                + New task
+                                {t("session.new_task_hover")}
                               </span>
                             </button>
                           </Show>
@@ -844,7 +855,7 @@ export default function WorkspaceSessionList(props: Props) {
                       }
                     >
                       <div class="w-full rounded-[15px] px-3 py-2.5 text-left text-[11px] text-gray-10">
-                        Loading tasks...
+                        {t("session.loading_tasks")}
                       </div>
                     </Show>
                   </Show>
@@ -864,8 +875,63 @@ export default function WorkspaceSessionList(props: Props) {
           onClick={props.onOpenCreateWorkspace}
         >
           <Plus size={14} />
-          Add workspace
+          {t("session.add_workspace")}
         </button>
+<<<<<<< HEAD
+
+        <Show when={addWorkspaceMenuOpen()}>
+          <div class="absolute left-0 right-0 bottom-full z-20 mb-2 overflow-hidden rounded-[18px] border border-dls-border bg-dls-surface p-1.5 shadow-[var(--dls-shell-shadow)]">
+            <button
+              type="button"
+              class={`w-full flex items-center gap-2 rounded-xl px-3 py-2 text-xs transition-colors ${
+                newWorkspaceDesktopOnly
+                  ? "cursor-not-allowed text-gray-9 opacity-70"
+                  : "text-gray-11 hover:bg-gray-2 hover:text-gray-12"
+              }`}
+              disabled={newWorkspaceDesktopOnly}
+              title={
+                newWorkspaceDesktopOnly
+                  ? t("session.create_local_desktop_only")
+                  : undefined
+              }
+              onClick={() => {
+                props.onOpenCreateWorkspace();
+                setAddWorkspaceMenuOpen(false);
+              }}
+            >
+              <Plus size={12} />
+              <span class="flex-1 text-left">{t("session.new_workspace")}</span>
+              <Show when={newWorkspaceDesktopOnly}>
+                <DesktopOnlyBadge />
+              </Show>
+            </button>
+            <button
+              type="button"
+              class="w-full flex items-center gap-2 rounded-xl px-3 py-2 text-xs text-gray-11 transition-colors hover:bg-gray-2 hover:text-gray-12"
+              onClick={() => {
+                props.onOpenCreateRemoteWorkspace();
+                setAddWorkspaceMenuOpen(false);
+              }}
+            >
+              <Plus size={12} />
+              {t("session.connect_remote_workspace")}
+            </button>
+            <button
+              type="button"
+              class="w-full flex items-center gap-2 rounded-xl px-3 py-2 text-xs text-gray-11 transition-colors hover:bg-gray-2 hover:text-gray-12 disabled:cursor-not-allowed disabled:opacity-60"
+              disabled={props.importingWorkspaceConfig}
+              onClick={() => {
+                props.onImportWorkspaceConfig();
+                setAddWorkspaceMenuOpen(false);
+              }}
+            >
+              <Plus size={12} />
+              {t("session.import_config")}
+            </button>
+          </div>
+        </Show>
+=======
+>>>>>>> upstream/dev
       </div>
     </div>
   );
diff --git a/apps/app/src/app/components/workspace-right-sidebar.tsx b/apps/app/src/app/components/workspace-right-sidebar.tsx
index ef661b196..9142748f4 100644
--- a/apps/app/src/app/components/workspace-right-sidebar.tsx
+++ b/apps/app/src/app/components/workspace-right-sidebar.tsx
@@ -1,4 +1,5 @@
 import { Show, type JSX } from "solid-js";
+import { t, currentLocale } from "../../i18n";
 import {
   Box,
   ChevronLeft,
@@ -38,6 +39,7 @@ type Props = {
 };
 
 export default function WorkspaceRightSidebar(props: Props) {
+  const translate = (key: string) => t(key, currentLocale());
   const mobile = () => props.mobile ?? false;
   const showSelection = () => props.showSelection ?? true;
   const closeMobile = () => props.onCloseMobile?.();
@@ -88,8 +90,8 @@ export default function WorkspaceRightSidebar(props: Props) {
           type="button"
           class="flex h-10 w-10 items-center justify-center rounded-[16px] text-gray-10 transition-colors hover:bg-dls-surface hover:text-dls-text"
           onClick={mobile() ? closeMobile : props.onToggleExpanded}
-          title={mobile() ? "Close sidebar" : props.expanded ? "Collapse sidebar" : "Expand sidebar"}
-          aria-label={mobile() ? "Close sidebar" : props.expanded ? "Collapse sidebar" : "Expand sidebar"}
+          title={mobile() ? translate("session.close_sidebar") : props.expanded ? translate("session.collapse_sidebar") : translate("session.expand_sidebar")}
+          aria-label={mobile() ? translate("session.close_sidebar") : props.expanded ? translate("session.collapse_sidebar") : translate("session.expand_sidebar")}
         >
           <Show
             when={mobile()}
@@ -102,7 +104,7 @@ export default function WorkspaceRightSidebar(props: Props) {
       <div class={`flex-1 overflow-y-auto ${props.expanded ? "space-y-5 pt-1" : "space-y-3 pt-1"}`}>
         <div class="mb-2 space-y-1">
           {sidebarButton(
-            "Automations",
+            translate("session.sidebar_automations"),
             <History size={18} />,
             showSelection() && props.settingsTab === "automations",
             props.onOpenAutomations,
@@ -114,7 +116,7 @@ export default function WorkspaceRightSidebar(props: Props) {
             props.onOpenSkills,
           )}
           {sidebarButton(
-            "Extensions",
+            translate("session.sidebar_extensions"),
             <Box size={18} />,
             showSelection() && props.settingsTab === "extensions",
             props.onOpenExtensions,
diff --git a/apps/app/src/app/context/providers/provider-auth-modal.tsx b/apps/app/src/app/context/providers/provider-auth-modal.tsx
index 3b6248cf3..0fe56c0f8 100644
--- a/apps/app/src/app/context/providers/provider-auth-modal.tsx
+++ b/apps/app/src/app/context/providers/provider-auth-modal.tsx
@@ -1,5 +1,11 @@
 import { CheckCircle2, Loader2, X, Search, ChevronRight } from "lucide-solid";
 import { createEffect, createMemo, createSignal, For, onCleanup, Show } from "solid-js";
+<<<<<<< HEAD:apps/app/src/app/components/provider-auth-modal.tsx
+import { isTauriRuntime } from "../utils";
+import { compareProviders } from "../utils/providers";
+import { t, currentLocale } from "../../i18n";
+=======
+>>>>>>> upstream/dev:apps/app/src/app/context/providers/provider-auth-modal.tsx
 
 import type { ProviderListItem } from "../../types";
 import { isTauriRuntime } from "../../utils";
@@ -9,6 +15,16 @@ import ProviderIcon from "../../components/provider-icon";
 import TextInput from "../../components/text-input";
 import type { ProviderAuthMethod, ProviderOAuthStartResult } from "./store";
 
+<<<<<<< HEAD:apps/app/src/app/components/provider-auth-modal.tsx
+const translate = (key: string) => t(key, currentLocale());
+
+export type ProviderAuthMethod = {
+  type: "oauth" | "api";
+  label: string;
+  methodIndex?: number;
+};
+=======
+>>>>>>> upstream/dev:apps/app/src/app/context/providers/provider-auth-modal.tsx
 type ProviderAuthEntry = {
   id: string;
   name: string;
@@ -117,7 +133,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
   });
 
   const methodLabel = (method: ProviderAuthMethod) =>
-    method.label || (method.type === "oauth" ? "OAuth" : "API key");
+    method.label || (method.type === "oauth" ? translate("provider.oauth_method") : translate("provider.api_key_method"));
 
   const actionDisabled = () => props.loading || props.submitting;
 
@@ -593,14 +609,14 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
         <div class="bg-gray-2 border border-gray-6/70 w-full max-w-lg rounded-2xl shadow-2xl overflow-hidden max-h-[calc(100vh-2rem)] flex flex-col">
           <div class="px-6 pt-6 pb-4 border-b border-gray-6/50 flex items-start justify-between gap-4">
             <div>
-              <h3 class="text-lg font-semibold text-gray-12">Connect providers</h3>
-              <p class="text-sm text-gray-11 mt-1">Sign in to services you want OpenWork to use.</p>
+              <h3 class="text-lg font-semibold text-gray-12">{translate("provider.connect_title")}</h3>
+              <p class="text-sm text-gray-11 mt-1">{translate("provider.connect_desc")}</p>
             </div>
             <Button
               variant="ghost"
               class="!p-2 rounded-full"
               onClick={handleClose}
-              aria-label="Close"
+              aria-label={translate("provider.close")}
             >
               <X size={16} />
             </Button>
@@ -613,7 +629,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                 fallback={
                   <Show when={props.loading}>
                     <div class="rounded-xl border border-gray-6 bg-gray-1/60 px-4 py-3 text-sm text-gray-10 animate-pulse">
-                      Loading providers...
+                      {translate("provider.loading")}
                     </div>
                   </Show>
                 }
@@ -633,7 +649,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                       <input
                         ref={searchInputEl}
                         type="text"
-                        placeholder="Filter providers by name or ID"
+                        placeholder={translate("provider.filter_placeholder")}
                         value={searchQuery()}
                         onInput={(event) => {
                           setSearchQuery(event.currentTarget.value);
@@ -651,7 +667,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                       when={filteredEntries().length}
                       fallback={
                         <div class="text-sm text-gray-10 pt-2">
-                          {entries().length ? "No providers match your search." : "No providers available."}
+                          {entries().length ? translate("provider.no_match") : translate("provider.none_available")}
                         </div>
                       }
                     >
@@ -690,7 +706,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                                     >
                                       <div class="flex items-center gap-1 text-[11px] font-medium text-green-11 bg-green-4/20 border border-green-5/30 px-1.5 py-0.5 rounded-md">
                                         <CheckCircle2 size={12} strokeWidth={2.5} />
-                                        Connected
+                                        {translate("provider.connected")}
                                       </div>
                                     </Show>
                                   </div>
@@ -719,7 +735,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                       </For>
                     </Show>
 
-                    <div class="text-[11px] text-gray-9">Arrow keys to navigate, Enter to select.</div>
+                    <div class="text-[11px] text-gray-9">{translate("provider.keyboard_hint")}</div>
                   </div>
                 </Show>
 
@@ -728,10 +744,10 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                     <div class="flex items-center justify-between gap-4">
                       <div>
                         <div class="text-sm font-medium text-gray-12">{selectedEntry()!.name}</div>
-                        <div class="text-xs text-gray-10 mt-1">Choose how you'd like to connect.</div>
+                        <div class="text-xs text-gray-10 mt-1">{translate("provider.choose_connect")}</div>
                       </div>
                       <Button variant="ghost" onClick={handleBack} disabled={actionDisabled()}>
-                        Back
+                        {translate("provider.back")}
                       </Button>
                     </div>
                     <div class="grid gap-2">
@@ -764,13 +780,13 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                         <div class="text-xs text-gray-10 mt-1">Paste your API key to connect.</div>
                       </div>
                       <Button variant="ghost" onClick={handleBack} disabled={actionDisabled()}>
-                        Back
+                        {translate("provider.back")}
                       </Button>
                     </div>
                     <TextInput
-                      label="API key"
+                      label={translate("provider.api_key_method")}
                       type="password"
-                      placeholder="sk-..."
+                      placeholder={translate("provider.api_key_placeholder")}
                       value={apiKeyInput()}
                       onInput={(event) => {
                         setApiKeyInput(event.currentTarget.value);
@@ -783,7 +799,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                     />
                     <Show when={selectedEntry()!.env.length > 0}>
                       <div class="text-[11px] text-gray-9">
-                        Env vars: <span class="font-mono">{selectedEntry()!.env.join(", ")}</span>
+                        {translate("provider.env_vars_label")}<span class="font-mono">{selectedEntry()!.env.join(", ")}</span>
                       </div>
                     </Show>
                     <div class="flex items-center justify-between gap-3">
@@ -809,7 +825,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                         <div class="text-xs text-gray-10 mt-1">Finish OAuth by pasting the authorization code.</div>
                       </div>
                       <Button variant="ghost" onClick={handleBack} disabled={actionDisabled()}>
-                        Back
+                        {translate("provider.back")}
                       </Button>
                     </div>
                     <div class="text-xs text-gray-9">
@@ -821,9 +837,9 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                       </div>
                     </Show>
                     <TextInput
-                      label="Authorization code"
+                      label={translate("provider.confirmation_code_label")}
                       type="text"
-                      placeholder="Paste code"
+                      placeholder={translate("provider.paste_code_placeholder")}
                       value={oauthCodeInput()}
                       onInput={(event) => {
                         setOauthCodeInput(event.currentTarget.value);
@@ -865,16 +881,16 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                     <div class="flex items-center justify-between gap-4">
                       <div>
                         <div class="text-sm font-medium text-gray-12">{selectedEntry()!.name}</div>
-                        <div class="text-xs text-gray-10 mt-1">Waiting for browser confirmation.</div>
+                        <div class="text-xs text-gray-10 mt-1">{translate("provider.waiting_browser")}</div>
                       </div>
                       <Button variant="ghost" onClick={handleBack} disabled={actionDisabled()}>
-                        Back
+                        {translate("provider.back")}
                       </Button>
                     </div>
                     <Show
                       when={isOpenAiHeadlessSession()}
                       fallback={
-                        <div class="text-xs text-gray-9">Sign in in the browser tab we just opened. We will complete the connection automatically.</div>
+                        <div class="text-xs text-gray-9">{translate("provider.browser_signin_desc")}</div>
                       }
                     >
                       <div class="space-y-2 text-xs text-gray-9">
@@ -883,13 +899,13 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                           The first time you do this you&apos;ll need to enable Device auth in your account settings.
                         </div>
                         <div>ChatGPT &gt; Account Settings &gt; Security &gt; Enable device code authorization</div>
-                        <div>When you&apos;re ready, copy the code below, and click &quot;Open Browser&quot;.</div>
+                        <div>{translate("provider.copy_code_desc")}</div>
                       </div>
                     </Show>
                     <Show when={oauthDisplayCode()}>
                       <div class="rounded-xl border border-gray-6/70 bg-gray-2/40 px-3 py-3 flex items-center gap-3">
                         <div class="flex-1 min-w-0">
-                          <div class="text-[10px] uppercase tracking-wide text-gray-8">Confirmation code</div>
+                          <div class="text-[10px] uppercase tracking-wide text-gray-8">{translate("provider.confirmation_code_label")}</div>
                           <div class="text-sm text-gray-12 font-mono break-all">{oauthDisplayCode()}</div>
                         </div>
                         <Button variant="ghost" class="text-xs shrink-0" onClick={() => void copyOauthDisplayCode()}>
@@ -897,6 +913,12 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                         </Button>
                       </div>
                     </Show>
+<<<<<<< HEAD:apps/app/src/app/components/provider-auth-modal.tsx
+                    <div class="flex items-center gap-2 text-xs text-gray-9">
+                      <Loader2 size={14} class={props.submitting || pollingBusy() || oauthAutoBusy() ? "animate-spin" : ""} />
+                      <span>{translate("provider.checking_status")}</span>
+                    </div>
+=======
                     <Show
                       when={isOpenAiHeadlessSession() && !oauthBrowserOpened()}
                       fallback={
@@ -910,6 +932,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                         <span>Authorization checks will start after you click Open Browser.</span>
                       </div>
                     </Show>
+>>>>>>> upstream/dev:apps/app/src/app/context/providers/provider-auth-modal.tsx
                     <div class="flex items-center justify-between gap-3">
                       <Button
                         variant="outline"
@@ -921,10 +944,10 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
                         {isOpenAiHeadlessSession()
                           ? oauthBrowserOpened()
                             ? "Reopen Browser"
-                            : "Open Browser"
+                            : translate("provider.open_browser")
                           : "Open browser again"}
                       </Button>
-                      <div class="text-[11px] text-gray-9 text-right">This window will close once the provider is connected.</div>
+                      <div class="text-[11px] text-gray-9 text-right">{translate("provider.browser_close_hint")}</div>
                     </div>
                   </div>
                 </Show>
@@ -937,7 +960,7 @@ export default function ProviderAuthModal(props: ProviderAuthModalProps) {
               <Show when={props.submitting}>{submittingLabel()}</Show>
             </div>
             <Button variant="ghost" onClick={handleClose} disabled={actionDisabled()}>
-              Close
+              {translate("provider.close")}
             </Button>
           </div>
         </div>
diff --git a/apps/app/src/app/pages/settings.tsx b/apps/app/src/app/pages/settings.tsx
index 840bcbcce..2af49c1b8 100644
--- a/apps/app/src/app/pages/settings.tsx
+++ b/apps/app/src/app/pages/settings.tsx
@@ -238,11 +238,10 @@ export function OpenCodeRouterSettings(_props: {
     <div class="bg-gray-2/30 border border-gray-6/50 rounded-2xl p-5 space-y-2">
       <div class="flex items-center gap-2">
         <MessageCircle size={16} class="text-gray-11" />
-        <div class="text-sm font-medium text-gray-12">Messaging</div>
+        <div class="text-sm font-medium text-gray-12">{t("settings.messaging")}</div>
       </div>
       <div class="text-xs text-gray-10">
-        Manage Telegram/Slack identities and bindings in the{" "}
-        <span class="font-medium text-gray-12">Identities</span> tab.
+        {t("settings.identities_tab_hint")}
       </div>
     </div>
   );
@@ -1587,8 +1586,142 @@ export default function SettingsView(props: SettingsViewProps) {
                   onClick={modelControls.openDefaultModelPicker}
                   disabled={props.busy}
                 >
+<<<<<<< HEAD
+                  <div class="flex flex-col overflow-hidden rounded-xl border border-gray-5/60 bg-white/50 shadow-sm dark:bg-gray-1/50">
+                    <Show when={props.authorizedFoldersHint}>
+                      {(hint) => (
+                        <div class="bg-gray-2/60 px-3 py-2 text-[11px] text-gray-10 border-b border-gray-5/40">
+                          {hint()}
+                        </div>
+                      )}
+                    </Show>
+
+                    <Show
+                      when={props.authorizedFolders.length > 0}
+                      fallback={
+                        <div class="flex flex-col items-center justify-center p-6 text-center">
+                          <div class="flex h-10 w-10 items-center justify-center rounded-full bg-blue-3/30 text-blue-11 mb-3">
+                            <Folder size={20} />
+                          </div>
+                          <div class="text-sm font-medium text-gray-11">{t("settings.no_authorized_folders")}</div>
+                          <div class="text-[11px] text-gray-9 mt-1 max-w-[40ch]">
+                            Add a folder to let this workspace read and edit files outside its root directory.
+                          </div>
+                        </div>
+                      }
+                    >
+                      <div class="flex flex-col divide-y divide-gray-5/40 max-h-[300px] overflow-y-auto">
+                        <For each={props.authorizedFolders}>
+                          {(folder) => {
+                            const folderName = folder.split(/[/\\]/).filter(Boolean).pop() || folder;
+                            return (
+                              <div class="group flex items-center justify-between px-3 py-2.5 hover:bg-gray-2/50 transition-colors">
+                                <div class="flex items-center gap-3 overflow-hidden">
+                                  <div class="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-blue-3/30 text-blue-11">
+                                    <Folder size={15} />
+                                  </div>
+                                  <div class="flex min-w-0 flex-col">
+                                    <span class="truncate text-sm font-medium text-gray-12">{folderName}</span>
+                                    <span class="truncate font-mono text-[10px] text-gray-8">{folder}</span>
+                                  </div>
+                                </div>
+                                <Button
+                                  variant="ghost"
+                                  class="h-7 w-7 text-gray-8 hover:text-red-11 opacity-0 group-hover:opacity-100 transition-opacity p-0 shrink-0"
+                                  onClick={() => void props.removeAuthorizedFolder(folder)}
+                                  disabled={
+                                    props.authorizedFoldersLoading ||
+                                    props.authorizedFoldersSaving ||
+                                    !props.authorizedFoldersEditable
+                                  }
+                                  aria-label={`Remove ${folderName}`}
+                                >
+                                  <X size={14} />
+                                </Button>
+                              </div>
+                            );
+                          }}
+                        </For>
+                      </div>
+                    </Show>
+
+                    <Show when={props.authorizedFoldersStatus}>
+                      {(status) => (
+                        <div class="bg-blue-2/30 px-3 py-2 text-[11px] text-blue-11 border-t border-gray-5/40">
+                          {status()}
+                        </div>
+                      )}
+                    </Show>
+                    <Show when={props.authorizedFoldersError}>
+                      {(error) => (
+                        <div class="bg-red-2/30 px-3 py-2 text-[11px] text-red-11 border-t border-gray-5/40">
+                          {error()}
+                        </div>
+                      )}
+                    </Show>
+
+                    <form
+                      class="flex items-center gap-2 bg-gray-2/60 border-t border-gray-5/60 p-2"
+                      onSubmit={(event) => {
+                        event.preventDefault();
+                        void props.addAuthorizedFolder();
+                      }}
+                    >
+                      <div class="relative flex-1">
+                        <input
+                          class="w-full rounded-lg border border-gray-5/60 bg-white px-3 py-1.5 text-xs text-gray-12 placeholder:text-gray-8 focus:outline-none focus:ring-2 focus:ring-blue-7/30 dark:bg-gray-2 disabled:opacity-50"
+                          value={props.authorizedFolderDraft}
+                          onInput={(event) =>
+                            props.setAuthorizedFolderDraft(event.currentTarget.value)
+                          }
+                          onPaste={(event) => {
+                            event.preventDefault();
+                          }}
+                          placeholder={t("settings.folder_path_placeholder")}
+                          disabled={
+                            props.authorizedFoldersLoading ||
+                            props.authorizedFoldersSaving ||
+                            !props.authorizedFoldersEditable
+                          }
+                        />
+                      </div>
+                      
+                      <Show when={canPickAuthorizedFolder()}>
+                        <Button
+                          type="button"
+                          variant="outline"
+                          class="h-8 px-3 text-xs bg-white dark:bg-gray-2"
+                          onClick={() => void props.pickAuthorizedFolder()}
+                          disabled={
+                            props.authorizedFoldersLoading ||
+                            props.authorizedFoldersSaving ||
+                            !props.authorizedFoldersEditable
+                          }
+                        >
+                          <FolderSearch size={13} class="mr-1.5" /> Browse
+                        </Button>
+                      </Show>
+                      
+                      <Button
+                        type="submit"
+                        variant="primary"
+                        class="h-8 px-3 text-xs bg-gray-12 text-gray-1 hover:bg-gray-11 dark:bg-gray-3 dark:text-gray-12 dark:hover:bg-gray-4 border border-transparent dark:border-gray-5"
+                        disabled={
+                          props.authorizedFoldersLoading ||
+                          props.authorizedFoldersSaving ||
+                          !props.authorizedFoldersEditable ||
+                          !props.authorizedFolderDraft.trim()
+                        }
+                      >
+                        {props.authorizedFoldersSaving ? "Adding..." : "Add"}
+                      </Button>
+                    </form>
+                  </div>
+                </Show>
+=======
                   Change
                 </Button>
+>>>>>>> upstream/dev
               </div>
 
               <div class="flex items-center justify-between bg-gray-1 p-3 rounded-xl border border-gray-6 gap-3">
@@ -1867,7 +2000,7 @@ export default function SettingsView(props: SettingsViewProps) {
 
                 <div class="flex items-center justify-between bg-gray-1 p-3 rounded-xl border border-gray-6 gap-3">
                   <div class="min-w-0">
-                    <div class="text-sm text-gray-12">Hide titlebar</div>
+                    <div class="text-sm text-gray-12">{t("settings.hide_titlebar")}</div>
                     <div class="text-xs text-gray-7">
                       Hide the window titlebar. Useful for tiling window
                       managers on Linux (Hyprland, i3, sway).
@@ -1888,18 +2021,113 @@ export default function SettingsView(props: SettingsViewProps) {
         </Match>
 
         <Match when={activeTab() === "den"}>
+<<<<<<< HEAD
+          <DenSettingsPanel
+            developerMode={props.developerMode}
+            connectRemoteWorkspace={props.connectRemoteWorkspace}
+          />
+        </Match>
+
+        <Match when={activeTab() === "model"}>
+          <div class="space-y-6">
+            <div class="bg-gray-2/30 border border-gray-6/50 rounded-2xl p-5 space-y-4">
+              <div>
+                <div class="text-sm font-medium text-gray-12">Model</div>
+                <div class="text-xs text-gray-10">
+                  Pick the default chat model and review how it reasons.
+                </div>
+              </div>
+
+              <div class="flex items-center justify-between bg-gray-1 p-3 rounded-xl border border-gray-6 gap-3">
+                <div class="min-w-0">
+                  <div class="text-sm text-gray-12 truncate">
+                    {props.defaultModelLabel}
+                  </div>
+                  <div class="text-xs text-gray-7 font-mono truncate">
+                    {props.defaultModelRef}
+                  </div>
+                </div>
+                <Button
+                  variant="outline"
+                  class="text-xs h-8 py-0 px-3 shrink-0"
+                  onClick={props.openDefaultModelPicker}
+                  disabled={props.busy}
+                >
+                  Change
+                </Button>
+              </div>
+
+              <div class="flex items-center justify-between bg-gray-1 p-3 rounded-xl border border-gray-6 gap-3">
+                <div class="min-w-0">
+                  <div class="text-sm text-gray-12">{t("settings.show_model_reasoning")}</div>
+                  <div class="text-xs text-gray-7">
+                    Expand reasoning traces in the UI when a model exposes them.
+                  </div>
+                </div>
+                <Button
+                  variant="outline"
+                  class="text-xs h-8 py-0 px-3 shrink-0"
+                  onClick={props.toggleShowThinking}
+                  disabled={props.busy}
+                >
+                  {props.showThinking ? "On" : "Off"}
+                </Button>
+              </div>
+
+              <div class="flex items-center justify-between bg-gray-1 p-3 rounded-xl border border-gray-6 gap-3">
+                <div class="min-w-0">
+                  <div class="text-sm text-gray-12">
+                    Auto context compaction
+                  </div>
+                  <div class="text-xs text-gray-7">
+                    Automatically compact after a run completes.
+                  </div>
+                </div>
+                <Button
+                  variant="outline"
+                  class="text-xs h-8 py-0 px-3 shrink-0"
+                  onClick={props.toggleAutoCompactContext}
+                  disabled={props.busy}
+                >
+                  {props.autoCompactContext ? "On" : "Off"}
+                </Button>
+              </div>
+
+              <div class="flex items-center justify-between bg-gray-1 p-3 rounded-xl border border-gray-6 gap-3">
+                <div class="min-w-0">
+                  <div class="text-sm text-gray-12">{t("settings.model_behavior")}</div>
+                  <div class="text-xs text-gray-7 truncate">
+                    Open the default model picker to choose reasoning profiles when they are available.
+                  </div>
+                  <div class="mt-1 text-xs text-gray-8 font-medium truncate">
+                    {props.modelVariantLabel}
+                  </div>
+                </div>
+                <Button
+                  variant="outline"
+                  class="text-xs h-8 py-0 px-3 shrink-0"
+                  onClick={props.editModelVariant}
+                  disabled={props.busy}
+                >
+                  Configure
+                </Button>
+              </div>
+            </div>
+          </div>
+=======
             <DenSettingsPanel
               developerMode={props.developerMode}
               connectRemoteWorkspace={props.connectRemoteWorkspace}
               openTeamBundle={props.openTeamBundle}
             />
+>>>>>>> upstream/dev
         </Match>
 
         <Match when={activeTab() === "advanced"}>
           <div class="space-y-6">
             <div class={`${settingsPanelClass} space-y-4`}>
               <div>
-                <div class="text-sm font-medium text-gray-12">Runtime</div>
+                <div class="text-sm font-medium text-gray-12">{t("settings.runtime")}</div>
                 <div class="text-xs text-gray-9">
                   Status for your local engine and OpenWork server.
                 </div>
@@ -1965,7 +2193,7 @@ export default function SettingsView(props: SettingsViewProps) {
 
               <div class="flex items-center justify-between bg-gray-1 p-3 rounded-xl border border-gray-6 gap-3">
                 <div class="min-w-0">
-                  <div class="text-sm text-gray-12">Enable Exa web search</div>
+                  <div class="text-sm text-gray-12">{t("settings.enable_exa_search")}</div>
                   <div class="text-xs text-gray-7">
                     Applies when OpenWork Orchestrator launches OpenCode. Off by
                     default until the integration is fully rolled out.
@@ -1987,7 +2215,7 @@ export default function SettingsView(props: SettingsViewProps) {
             </div>
 
             <div class={`${settingsPanelClass} space-y-3`}>
-              <div class="text-sm font-medium text-gray-12">Developer mode</div>
+              <div class="text-sm font-medium text-gray-12">{t("settings.developer_mode")}</div>
               <div class="text-xs text-gray-9">
                 Enables debug tools, diagnostics, and the Developer tab.
               </div>
@@ -2064,6 +2292,34 @@ export default function SettingsView(props: SettingsViewProps) {
                             debugDeepLinkBusy() ||
                             !debugDeepLinkInput().trim()
                           }
+<<<<<<< HEAD
+                          rows={3}
+                          placeholder={t("settings.scheme_placeholder")}
+                          class="w-full rounded-xl border border-gray-6 bg-gray-1 px-3 py-2 text-xs font-mono text-gray-12 outline-none transition focus:border-blue-8"
+                        />
+                        <div class="flex flex-wrap items-center gap-2">
+                          <Button
+                            variant="secondary"
+                            class="text-xs h-8 py-0 px-3"
+                            onClick={() => void submitDebugDeepLink()}
+                            disabled={
+                              props.busy ||
+                              debugDeepLinkBusy() ||
+                              !debugDeepLinkInput().trim()
+                            }
+                          >
+                            {debugDeepLinkBusy() ? "Opening..." : "Open deeplink"}
+                          </Button>
+                          <div class="text-[11px] text-gray-8">
+                            Accepts <span class="font-mono">openwork://</span>,{" "}
+                            <span class="font-mono">openwork-dev://</span>, or a
+                            raw supported{" "}
+                            <span class="font-mono">
+                              https://share.openwork.software/b/...
+                            </span>{" "}
+                            URL.
+                          </div>
+=======
                         >
                           {debugDeepLinkBusy() ? "Opening..." : "Open deeplink"}
                         </Button>
@@ -2075,6 +2331,7 @@ export default function SettingsView(props: SettingsViewProps) {
                             https://share.openworklabs.com/b/...
                           </span>{" "}
                           URL.
+>>>>>>> upstream/dev
                         </div>
                       </div>
                     </div>
diff --git a/apps/app/src/app/shell/settings-shell.tsx b/apps/app/src/app/shell/settings-shell.tsx
index 38255ef56..5a76a204e 100644
--- a/apps/app/src/app/shell/settings-shell.tsx
+++ b/apps/app/src/app/shell/settings-shell.tsx
@@ -64,6 +64,7 @@ import {
   Zap,
 } from "lucide-solid";
 import type { Language } from "../../i18n";
+import { t, currentLocale } from "../../i18n";
 
 export type SettingsShellProps = {
   settingsTab: SettingsTab;
@@ -257,9 +258,41 @@ export type SettingsShellProps = {
   openDebugDeepLink: (rawUrl: string) => Promise<{ ok: boolean; message: string }>;
 };
 
+<<<<<<< HEAD:apps/app/src/app/pages/dashboard.tsx
+type SharedSkillItem = {
+  name: string;
+  description?: string;
+  content: string;
+  trigger?: string;
+};
+
+type WorkspaceProfileBundleV1 = {
+  schemaVersion: 1;
+  type: "workspace-profile";
+  name: string;
+  description: string;
+  workspace: OpenworkWorkspaceExport;
+};
+
+type SkillsSetBundleV1 = {
+  schemaVersion: 1;
+  type: "skills-set";
+  name: string;
+  description: string;
+  skills: SharedSkillItem[];
+  sourceWorkspace?: {
+    id?: string;
+    name?: string;
+  };
+};
+
+export default function DashboardView(props: DashboardViewProps) {
+  const translate = (key: string) => t(key, currentLocale());
+=======
 export default function SettingsShell(props: SettingsShellProps) {
   const connections = useConnections();
   const extensions = useExtensions();
+>>>>>>> upstream/dev:apps/app/src/app/shell/settings-shell.tsx
   const platform = usePlatform();
   const webDeployment = createMemo(() => getOpenWorkDeployment() === "web");
   const title = createMemo(() => {
@@ -1060,8 +1093,8 @@ export default function SettingsShell(props: SettingsShellProps) {
         <div
           class="absolute right-0 top-3 hidden h-[calc(100%-24px)] w-2 translate-x-1/2 cursor-col-resize rounded-full bg-transparent transition-colors hover:bg-gray-6/40 md:block"
           onPointerDown={startLeftSidebarResize}
-          title="Resize workspace column"
-          aria-label="Resize workspace column"
+          title={translate("session.resize_workspace_col")}
+          aria-label={translate("session.resize_workspace_col")}
         />
 
       </aside>
@@ -1112,10 +1145,17 @@ export default function SettingsShell(props: SettingsShellProps) {
           <div class="flex items-center text-gray-10">
             <button
               type="button"
+<<<<<<< HEAD:apps/app/src/app/pages/dashboard.tsx
+              class="flex h-9 w-9 items-center justify-center rounded-md text-gray-10 transition-colors hover:bg-gray-2/70 hover:text-dls-text md:hidden"
+              onClick={() => setMobileRightSidebarOpen(true)}
+              title={translate("session.open_sidebar")}
+              aria-label={translate("session.open_sidebar")}
+=======
               class="flex h-9 w-9 items-center justify-center rounded-md text-gray-10 transition-colors hover:bg-gray-2/70 hover:text-dls-text"
               onClick={props.toggleSettings}
               title="Close settings"
               aria-label="Close settings"
+>>>>>>> upstream/dev:apps/app/src/app/shell/settings-shell.tsx
             >
               <X size={18} />
             </button>
diff --git a/apps/app/src/i18n/index.ts b/apps/app/src/i18n/index.ts
index 5b0565764..e35a141fb 100644
--- a/apps/app/src/i18n/index.ts
+++ b/apps/app/src/i18n/index.ts
@@ -92,6 +92,7 @@ export const setLocale = (newLocale: Language) => {
  */
 export const t = (key: string, localeOverride?: Language): string => {
   const loc = localeOverride ?? locale();
+1
 
   // Try target language first
   if (TRANSLATIONS[loc]?.[key]) {
diff --git a/apps/app/src/i18n/locales/en.ts b/apps/app/src/i18n/locales/en.ts
index d00504ccb..caa7cf9da 100644
--- a/apps/app/src/i18n/locales/en.ts
+++ b/apps/app/src/i18n/locales/en.ts
@@ -862,4 +862,380 @@ export default {
   "app.error.command_name_template_required": "Command name and instructions are required.",
   "app.error.workspace_commands_desktop": "Commands require the desktop app.",
   "app.error.command_scope_unknown": "This command can't be managed in this mode.",
+
+  // ==================== Den Settings ====================
+  "den.status_ready": "Ready",
+  "den.status_provisioning": "Provisioning",
+  "den.status_failed": "Failed",
+  "den.status_stopped": "Stopped",
+  "den.status_unknown": "Unknown",
+  "den.summary_needs_attention": "Needs attention",
+  "den.summary_checking": "Checking session",
+  "den.summary_connected": "Connected",
+  "den.summary_signed_out": "Signed out",
+  "den.finish_creation": "Finish account creation in your browser to connect OpenWork.",
+  "den.finish_sign_in": "Finish signing in in your browser to connect OpenWork.",
+  "den.invalid_url": "Enter a valid http:// or https:// Den control plane URL.",
+  "den.url_updated": "Updated the Den control plane URL. Sign in again to continue.",
+  "den.loaded_orgs": "Loaded {count} org(s).",
+  "den.failed_load_orgs": "Failed to load orgs.",
+  "den.loaded_workers": "Loaded {count} worker(s) for {org}.",
+  "den.no_workers_found": "No workers found for {org}.",
+  "den.failed_load_workers": "Failed to load workers.",
+  "den.signed_in_as": "Signed in as {email}.",
+  "den.no_session": "No active Den session found.",
+  "den.connected_as": "Connected OpenWork Den as {email}.",
+  "den.connected": "Connected OpenWork Den.",
+  "den.sign_in_failed": "Failed to finish OpenWork Den sign-in.",
+  "den.signed_out_msg": "Signed out and cleared your OpenWork Den session on this device.",
+  "den.choose_org": "Choose an org before opening a worker.",
+  "den.worker_not_ready": "Worker is not ready to open yet. Try again after provisioning finishes.",
+  "den.failed_open_worker": "Failed to open {name} in OpenWork.",
+  "den.opened_worker": "Opened {name} in OpenWork.",
+  "den.failed_open": "Failed to open {name}.",
+  "den.title": "OpenWork Den",
+  "den.description": "Sign in, pick an org, and open Den workers from Settings.",
+  "den.tagline": "Sign in to OpenWork Den to keep your tasks alive even when your computer sleeps.",
+  "den.control_plane_url_label": "Den control plane URL",
+  "den.control_plane_url_hint": "Developer mode only. Use this to target a local or self-hosted Den control plane. Changing it signs you out so the app can re-hydrate against the new control plane.",
+  "den.reset": "Reset",
+  "den.save_url": "Save URL",
+  "den.open_in_browser": "Open in browser",
+  "den.sign_in_title": "Sign in to OpenWork Den",
+  "den.sign_in": "Sign in",
+  "den.create_account": "Create account",
+  "den.finish_auth": "Finish auth in your browser and OpenWork will reconnect here automatically.",
+  "den.account_title": "Den Account",
+  "den.account_description": "Manage your connected account and organization.",
+  "den.signing_out": "Signing out...",
+  "den.sign_out": "Sign out",
+  "den.active_org": "Active org",
+  "den.workers_scoped": "Workers are scoped to the selected org.",
+  "den.switched_org": "Switched to {org}.",
+  "den.owner_suffix": "(Owner)",
+  "den.member_suffix": "(Member)",
+  "den.workers_title": "Den workers",
+  "den.workers_description": "Open workers directly into OpenWork using the same remote-connect flow.",
+  "den.no_org_selected": "No org selected",
+  "den.refresh": "Refresh",
+  "den.no_workers_visible": "No cloud workers are visible for this org yet. Create one in Den, then refresh this tab.",
+  "den.mine_badge": "Mine",
+  "den.worker_type": "{provider} worker",
+  "den.cloud_worker": "Cloud worker",
+  "den.worker_not_ready_tooltip": "This worker is not ready to open yet.",
+  "den.opening": "Opening...",
+  "den.open": "Open",
+
+  // ==================== Settings (additional) ====================
+  "settings.messaging": "Messaging",
+  "settings.identities_tab_hint": "Manage Telegram/Slack identities and bindings in the Identities tab",
+  "settings.identities": "Identities",
+  "settings.no_authorized_folders": "No external folders authorized",
+  "settings.folder_path_placeholder": "Type a folder path to authorize...",
+  "settings.hide_titlebar": "Hide titlebar",
+  "settings.show_model_reasoning": "Show model reasoning",
+  "settings.model_behavior": "Model behavior",
+  "settings.runtime": "Runtime",
+  "settings.enable_exa_search": "Enable Exa web search",
+  "settings.developer_mode": "Developer mode",
+  "settings.scheme_placeholder": "openwork://...",
+
+  // ==================== Session (additional) ====================
+  "session.workspace_default": "Workspace",
+  "session.kind_sandbox": "Sandbox",
+  "session.kind_remote": "Remote",
+  "session.kind_local": "Local",
+  "session.reveal_finder": "Reveal in Finder",
+  "session.reveal_explorer": "Reveal in Explorer",
+  "session.hide_child_sessions": "Hide child sessions",
+  "session.show_child_sessions": "Show child sessions",
+  "session.session_actions": "Session actions",
+  "session.rename_session": "Rename session",
+  "session.delete_session": "Delete session",
+  "session.status_connecting": "Connecting",
+  "session.status_active": "Active",
+  "session.new_task_label": "New task",
+  "session.workspace_options": "Workspace options",
+  "session.collapse": "Collapse",
+  "session.expand": "Expand",
+  "session.edit_name": "Edit name",
+  "session.share": "Share...",
+  "session.recover": "Recover",
+  "session.test_connection": "Test connection",
+  "session.edit_connection": "Edit connection",
+  "session.remove_workspace": "Remove workspace",
+  "session.no_tasks_yet": "No tasks yet.",
+  "session.new_task_hover": "+ New task",
+  "session.show_more": "Show {count} more",
+  "session.show_more_generic": "Show more",
+  "session.loading_tasks": "Loading tasks...",
+  "session.add_workspace": "Add workspace",
+  "session.create_local_desktop_only": "Create local workspaces in the desktop app.",
+  "session.new_workspace": "New workspace",
+  "session.connect_remote_workspace": "Connect remote workspace",
+  "session.import_config": "Import config",
+  "session.sidebar_new_task": "New task",
+  "session.sidebar_workspaces": "Workspaces",
+  "session.sidebar_no_workspaces": "No workspaces in this session yet. Add one to get started.",
+  "session.sidebar_sandbox": "Sandbox",
+  "session.sidebar_remote": "Remote",
+  "session.sidebar_needs_attention": "Needs attention",
+  "session.sidebar_switch": "Switch",
+  "session.sidebar_active": "Active",
+  "session.sidebar_expand": "Expand",
+  "session.sidebar_collapse": "Collapse",
+  "session.sidebar_drag_reorder": "Drag to reorder",
+  "session.sidebar_edit_connection": "Edit connection",
+  "session.sidebar_test_connection": "Test connection",
+  "session.sidebar_stop_sandbox": "Stop sandbox",
+  "session.sidebar_remove": "Remove",
+  "session.sidebar_no_sessions": "No sessions yet.",
+  "session.sidebar_show_fewer": "Show fewer",
+  "session.sidebar_show_more": "Show {count} more",
+  "session.sidebar_add_workspace": "Add new workspace",
+  "session.sidebar_new_worker": "New worker",
+  "session.sidebar_connect_remote": "Connect remote",
+  "session.sidebar_import_config": "Import config",
+  "session.sidebar_progress": "Progress",
+  "session.sidebar_new_task_menu": "New task",
+  "session.sidebar_delete_session": "Delete session",
+  "session.inbox_share_hint": "Share files with this worker from the app.",
+  "session.inbox_load_failed": "Failed to load shared folder",
+  "session.inbox_connect_to_upload": "Connect to a worker to upload files to the shared folder.",
+  "session.inbox_uploading": "Uploading {label}...",
+  "session.inbox_uploaded": "Uploaded to the shared folder.",
+  "session.inbox_upload_failed": "Shared folder upload failed",
+  "session.inbox_copy_failed": "Copy failed. Your browser may block clipboard access.",
+  "session.inbox_connect_to_download": "Connect to a worker to download shared files.",
+  "session.inbox_missing_file_id": "Missing shared file id.",
+  "session.inbox_download_failed": "Download failed",
+  "session.inbox_shared_folder": "Shared folder",
+  "session.inbox_refresh": "Refresh shared folder",
+  "session.inbox_drop_to_upload": "Drop files here to upload",
+  "session.inbox_connect_upload": "Connect to a worker to upload",
+  "session.inbox_uploading_label": "Uploading...",
+  "session.inbox_drop_or_click": "Drop files or click to upload",
+  "session.inbox_connect_to_see": "Connect to see shared files.",
+  "session.inbox_no_files": "No shared files yet.",
+  "session.inbox_copy_path": "Copy shared folder path",
+  "session.inbox_download": "Download",
+  "session.inbox_showing_first": "Showing first {count}.",
+  "session.ctx_disabled": "Disabled",
+  "session.ctx_disconnected": "Disconnected",
+  "session.ctx_connected": "Connected",
+  "session.ctx_needs_auth": "Needs auth",
+  "session.ctx_register_client": "Register client",
+  "session.ctx_failed": "Failed",
+  "session.ctx_context": "Context",
+  "session.ctx_working_files": "Working files",
+  "session.ctx_none_yet": "None yet.",
+  "session.ctx_plugins": "Plugins",
+  "session.ctx_no_plugins": "No plugins loaded.",
+  "session.ctx_mcp": "MCP",
+  "session.ctx_no_mcp": "No MCP servers loaded.",
+  "session.ctx_skills": "Skills",
+  "session.ctx_no_skills": "No skills loaded.",
+  "session.ctx_authorized_folders": "Authorized folders",
+  "session.tool_run_command": "Run {cmd}",
+  "session.tool_run_command_fallback": "Run command",
+  "session.tool_reviewed_file": "Reviewed {file}",
+  "session.tool_reviewed_file_fallback": "Reviewed file",
+  "session.tool_updated_file": "Updated {file}",
+  "session.tool_updated_file_fallback": "Updated file",
+  "session.tool_update_file": "Update {file}",
+  "session.tool_update_file_fallback": "Update file",
+  "session.tool_searched": "Searched {pattern}",
+  "session.tool_searched_fallback": "Searched code",
+  "session.tool_reviewed_files": "Reviewed {path}",
+  "session.tool_reviewed_files_fallback": "Reviewed files",
+  "session.tool_delegate": "Delegate {agent}",
+  "session.tool_delegate_fallback": "Delegate task",
+  "session.tool_update_todo": "Update todo list",
+  "session.tool_read_todo": "Read todo list",
+  "session.tool_checked_url": "Checked {url}",
+  "session.tool_checked_url_fallback": "Checked web page",
+  "session.tool_load_skill": "Load skill {name}",
+  "session.tool_load_skill_fallback": "Load skill",
+  "session.subagent_session": "Subagent session",
+  "session.loading_transcript": "Loading transcript",
+  "session.subagent_running": "Running",
+  "session.waiting_transcript": "Waiting for transcript",
+  "session.waiting_subagent": "Waiting for the subagent transcript to arrive.",
+  "session.request_label": "Request",
+  "session.result_label": "Result",
+
+  // ==================== Provider ====================
+  "provider.connect_title": "Connect providers",
+  "provider.connect_desc": "Sign in to services you want OpenWork to use.",
+  "provider.loading": "Loading providers...",
+  "provider.filter_placeholder": "Filter providers by name or ID",
+  "provider.no_match": "No providers match your search.",
+  "provider.none_available": "No providers available.",
+  "provider.keyboard_hint": "Arrow keys to navigate, Enter to select.",
+  "provider.choose_connect": "Choose how you'd like to connect.",
+  "provider.api_key_placeholder": "sk-...",
+  "provider.env_vars_label": "Env vars: ",
+  "provider.paste_code_placeholder": "Paste code",
+  "provider.waiting_browser": "Waiting for browser confirmation.",
+  "provider.browser_signin_desc": "Sign in in the browser tab we just opened. We will complete the connection automatically.",
+  "provider.copy_code_desc": "When you're ready, copy the code below, and click \"Open Browser\".",
+  "provider.confirmation_code_label": "Confirmation code",
+  "provider.checking_status": "Checking connection status automatically...",
+  "provider.open_browser": "Open Browser",
+  "provider.browser_close_hint": "This window will close once the provider is connected.",
+  "provider.back": "Back",
+  "provider.oauth_method": "OAuth",
+  "provider.api_key_method": "API key",
+  "provider.connected": "Connected",
+  "provider.close": "Close",
+
+  // ==================== Question Modal ====================
+  "question.fallback_header": "Question",
+  "question.custom_answer_label": "Or type a custom answer",
+  "question.placeholder": "Type your answer here...",
+  "question.navigate_hint": "navigate",
+  "question.select_hint": "select",
+  "question.submit": "Submit",
+  "question.next": "Next",
+
+  // ==================== Model Picker ====================
+  "model_picker.connect_provider": "Connect this provider to browse and save models",
+  "model_picker.model_singular": "model",
+  "model_picker.model_plural": "models",
+  "model_picker.default_label": "Default model",
+  "model_picker.chat_label": "Chat model",
+  "model_picker.default_desc": "Choose the default model for new chats...",
+  "model_picker.chat_desc": "Choose the model for this chat...",
+  "model_picker.recommended": "Recommended",
+  "model_picker.other_connected": "Other connected models",
+  "model_picker.more_providers": "More providers",
+  "model_picker.no_match": "No models match your search.",
+
+  // ==================== Share Workspace ====================
+  "share.title": "Share workspace",
+  "share.tab_template": "Share a template",
+  "share.tab_remote": "Access workspace remotely",
+  "share.password_field": "Password",
+  "share.worker_url_field": "Worker URL",
+  "share.hide_password": "Hide password",
+  "share.reveal_password": "Reveal password",
+  "share.publishing": "Publishing...",
+  "share.back_to_options": "Back to share options",
+  "share.template_section_title": "Workspace template",
+  "share.template_section_desc": "Share the core setup and workspace defaults.",
+  "share.template_desc": "Share your setup and defaults so someone else can start from the same environment.",
+  "share.create_template_link": "Create Template Link",
+  "share.regenerate_link": "Regenerate Link",
+  "share.access_section_title": "Access workspace remotely",
+  "share.access_section_desc": "Copy the connection details needed to reach this live workspace from another machine or messaging surface.",
+  "share.live_access_warning": "Share with trusted people only. These credentials grant live access to this workspace.",
+  "share.reusable_desc": "Share a reusable setup without granting live access to this running workspace.",
+  "share.connect_messaging_title": "Connect messaging",
+  "share.connect_messaging_desc": "Use this workspace from Slack, Telegram, and others.",
+  "share.setup_button": "Setup",
+  "share.collaborator_access": "Optional collaborator access",
+  "share.collaborator_desc": "Routine access without permission approvals.",
+  "share.close": "Close",
+  "share.back": "Back",
+  "share.copy": "Copy",
+  "share.copy_link": "Copy link",
+
+  // ==================== MCP (additional) ====================
+  "mcp.already_connected": "Already Connected",
+  "mcp.auth_link_label": "Authorization link",
+  "mcp.copy_link": "Copy link",
+  "mcp.copied": "Copied",
+  "mcp.step_opening_browser": "Opening your browser",
+  "mcp.step_authorize": "Authorize OpenWork",
+  "mcp.step_return": "Return here when you're done",
+  "mcp.request_timed_out": "Request timed out.",
+  "mcp.server_fallback": "MCP Server",
+
+  // ==================== Dashboard (additional) ====================
+  "dashboard.create_workspace_close": "Close create workspace modal",
+  "dashboard.create_workspace_folder": "Workspace folder",
+  "dashboard.create_workspace_select_folder": "Select folder",
+  "dashboard.create_workspace_sandbox_setup": "Sandbox setup",
+  "dashboard.create_workspace_show_logs": "Show logs",
+  "dashboard.create_workspace_hide_logs": "Hide logs",
+  "dashboard.create_workspace_live_logs": "Live Logs",
+  "dashboard.create_workspace_docker_debug": "Docker debug details",
+  "dashboard.create_workspace_creating": "Creating...",
+
+  // ==================== Session (additional) ====================
+  "session.loading_commands": "Loading commands...",
+  "session.no_commands_found": "No commands found.",
+  "session.no_mentions_match": "No matches found.",
+  "session.task_placeholder": "Describe your task...",
+  "session.upload_shared_folder": "Upload to shared folder",
+  "session.run_task": "Run task",
+  "session.stop": "Stop",
+  "session.agent_label": "Agent",
+  "session.loading_agents": "Loading agents...",
+  "session.default_agent": "Default agent",
+  "session.insert_prompt": "Insert prompt",
+  "session.promo_try_it": "Try it now: set up my CRM in Notion",
+  "session.copy_message": "Copy message",
+  "session.stopping_run": "Stopping the run...",
+  "session.stopped": "Stopped.",
+  "session.resize_workspace_col": "Resize workspace column",
+  "session.quick_actions": "Quick actions (Ctrl/Cmd+K)",
+  "session.search_conversation": "Search conversation (Ctrl/Cmd+F)",
+  "session.undo_message": "Undo last message",
+  "session.redo_message": "Redo last reverted message",
+  "session.open_sidebar": "Open sidebar",
+  "session.search_chat_placeholder": "Search in this chat",
+  "session.close_sidebar": "Close sidebar",
+  "session.collapse_sidebar": "Collapse sidebar",
+  "session.expand_sidebar": "Expand sidebar",
+  "session.sidebar_automations": "Automations",
+  "session.sidebar_extensions": "Extensions",
+  "session.thinking_label": "Thinking",
+  "session.diagnostics_label": "Diagnostics",
+  "session.diff_label": "Diff",
+  "session.raw_read_output": "Raw read output",
+  "session.input_label": "Input",
+
+  // ==================== Reload (additional) ====================
+  "reload.was_removed": "was removed",
+  "reload.was_added": "was added",
+  "reload.was_updated": "was updated",
+  "reload.changed": "changed",
+  "reload.active_tasks": "Active tasks",
+  "reload.will_stop_tasks": "Reloading will stop active tasks.",
+  "reload.blocked_prefix": "Blocked: ",
+
+  // ==================== Onboarding (additional) ====================
+  "onboarding.starter_worker_name": "Starter worker",
+  "onboarding.starter_worker_desc": "Preconfigured to show you how to use plugins, commands, and skills.",
+  "onboarding.empty_worker_name": "Empty worker",
+  "onboarding.empty_worker_desc": "Start with a blank folder and add what you need.",
+  "onboarding.select_folder_step": "Select Folder",
+  "onboarding.choose_button": "Choose",
+  "onboarding.opening": "Opening...",
+  "onboarding.choose_preset_step": "Choose Preset",
+
+  // ==================== App (additional) ====================
+  "app.web_unavailable": "This feature is currently unavailable in OpenWork Web, check OpenWork Desktop for full functionality.",
+  "app.download_desktop": "Download OpenWork Desktop",
+  "app.desktop_only": "Desktop Only",
+
+  // ==================== Settings (additional) ====================
+  "settings.paste_token": "Paste your token",
+  "settings.copy_debug_state": "Copy sanitized runtime state for debugging.",
+  "settings.telegram_bot_token_placeholder": "Paste Telegram bot token from @BotFather",
+  "settings.slack_bot_token_placeholder": "xoxb-...",
+  "settings.slack_app_token_placeholder": "xapp-...",
+  "settings.messaging_instructions_placeholder": "Add messaging behavior instructions...",
+
+  // ==================== Common (additional) ====================
+  "common.copy": "Copy",
+  "common.copied": "Copied",
+
+  // ==================== Scheduled ====================
+  "scheduled.reload_to_activate": "Reload OpenWork to activate automations",
+  "scheduled.reload_activate_scheduler": "...activate opencode-scheduler.",
+  "scheduled.reloading": "Reloading...",
+  "scheduled.reload_button": "Reload OpenWork",
+  "scheduled.choose_folder": "Choose a folder",
 } as const;
diff --git a/apps/server/package.json b/apps/server/package.json
index 859d2a307..af695b734 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "jsonc-parser": "^3.2.1",
-    "minimatch": "^10.0.1",
+    "minimatch": "^10.2.3",
     "yaml": "^2.6.1"
   },
   "devDependencies": {
diff --git a/apps/share/package.json b/apps/share/package.json
index ddd2930ca..c662afb6f 100644
--- a/apps/share/package.json
+++ b/apps/share/package.json
@@ -15,7 +15,7 @@
     "@vercel/blob": "^0.27.0",
     "botid": "^1.5.11",
     "jsonc-parser": "^3.3.1",
-    "next": "16.1.6",
+    "next": "16.1.7",
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "sharp": "^0.34.5",
diff --git a/ee/apps/den-web/package.json b/ee/apps/den-web/package.json
index c3e4c4aa4..8cf3eaa16 100644
--- a/ee/apps/den-web/package.json
+++ b/ee/apps/den-web/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@paper-design/shaders-react": "0.0.71",
     "lucide-react": "^0.577.0",
-    "next": "16.2.1",
+    "next": "15.5.14",
     "react": "19.2.4",
     "react-dom": "19.2.4"
   },
diff --git a/ee/apps/landing/package.json b/ee/apps/landing/package.json
index b15973bc0..61eeb731a 100644
--- a/ee/apps/landing/package.json
+++ b/ee/apps/landing/package.json
@@ -13,7 +13,7 @@
     "botid": "^1.5.11",
     "framer-motion": "^12.35.1",
     "lucide-react": "^0.577.0",
-    "next": "14.2.5",
+    "next": "15.5.14",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a03507e26..a21b274c0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -197,8 +197,8 @@ importers:
         specifier: ^3.2.1
         version: 3.3.1
       minimatch:
-        specifier: ^10.0.1
-        version: 10.1.1
+        specifier: ^10.2.3
+        version: 10.2.3
       yaml:
         specifier: ^2.6.1
         version: 2.8.2
@@ -226,13 +226,13 @@ importers:
         version: 0.27.3
       botid:
         specifier: ^1.5.11
-        version: 1.5.11(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)
+        version: 1.5.11(next@15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4)
       jsonc-parser:
         specifier: ^3.3.1
         version: 3.3.1
       next:
-        specifier: 16.1.6
-        version: 16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+        specifier: 15.5.14
+        version: 15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       react:
         specifier: 19.2.4
         version: 19.2.4
@@ -417,8 +417,8 @@ importers:
         specifier: ^0.577.0
         version: 0.577.0(react@19.2.4)
       next:
-        specifier: 16.2.1
-        version: 16.2.1(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+        specifier: 15.5.14
+        version: 15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       react:
         specifier: 19.2.4
         version: 19.2.4
@@ -489,7 +489,7 @@ importers:
         version: 0.0.71(@types/react@18.2.79)(react@18.2.0)
       botid:
         specifier: ^1.5.11
-        version: 1.5.11(next@14.2.5(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)
+        version: 1.5.11(next@15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)
       framer-motion:
         specifier: ^12.35.1
         version: 12.35.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -497,8 +497,8 @@ importers:
         specifier: ^0.577.0
         version: 0.577.0(react@18.2.0)
       next:
-        specifier: 14.2.5
-        version: 14.2.5(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        specifier: 15.5.14
+        version: 15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react:
         specifier: 18.2.0
         version: 18.2.0
@@ -1564,14 +1564,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@isaacs/balanced-match@4.0.1':
-    resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==}
-    engines: {node: 20 || >=22}
-
-  '@isaacs/brace-expansion@5.0.0':
-    resolution: {integrity: sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==}
-    engines: {node: 20 || >=22}
-
   '@isaacs/fs-minipass@4.0.1':
     resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
     engines: {node: '>=18.0.0'}
@@ -1731,23 +1723,14 @@ packages:
   '@marijn/find-cluster-break@1.0.2':
     resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==}
 
-  '@next/env@14.2.5':
-    resolution: {integrity: sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==}
-
-  '@next/env@16.1.6':
-    resolution: {integrity: sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==}
+  '@next/env@15.5.14':
+    resolution: {integrity: sha512-aXeirLYuASxEgi4X4WhfXsShCFxWDfNn/8ZeC5YXAS2BB4A8FJi1kwwGL6nvMVboE7fZCzmJPNdMvVHc8JpaiA==}
 
   '@next/env@16.2.1':
     resolution: {integrity: sha512-n8P/HCkIWW+gVal2Z8XqXJ6aB3J0tuM29OcHpCsobWlChH/SITBs1DFBk/HajgrwDkqqBXPbuUuzgDvUekREPg==}
 
-  '@next/swc-darwin-arm64@14.2.5':
-    resolution: {integrity: sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@next/swc-darwin-arm64@16.1.6':
-    resolution: {integrity: sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==}
+  '@next/swc-darwin-arm64@15.5.14':
+    resolution: {integrity: sha512-Y9K6SPzobnZvrRDPO2s0grgzC+Egf0CqfbdvYmQVaztV890zicw8Z8+4Vqw8oPck8r1TjUHxVh8299Cg4TrxXg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
@@ -1758,14 +1741,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@14.2.5':
-    resolution: {integrity: sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@next/swc-darwin-x64@16.1.6':
-    resolution: {integrity: sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==}
+  '@next/swc-darwin-x64@15.5.14':
+    resolution: {integrity: sha512-aNnkSMjSFRTOmkd7qoNI2/rETQm/vKD6c/Ac9BZGa9CtoOzy3c2njgz7LvebQJ8iPxdeTuGnAjagyis8a9ifBw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
@@ -1776,14 +1753,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-linux-arm64-gnu@14.2.5':
-    resolution: {integrity: sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@next/swc-linux-arm64-gnu@16.1.6':
-    resolution: {integrity: sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==}
+  '@next/swc-linux-arm64-gnu@15.5.14':
+    resolution: {integrity: sha512-tjlpia+yStPRS//6sdmlVwuO1Rioern4u2onafa5n+h2hCS9MAvMXqpVbSrjgiEOoCs0nJy7oPOmWgtRRNSM5Q==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -1794,14 +1765,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-arm64-musl@14.2.5':
-    resolution: {integrity: sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@next/swc-linux-arm64-musl@16.1.6':
-    resolution: {integrity: sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==}
+  '@next/swc-linux-arm64-musl@15.5.14':
+    resolution: {integrity: sha512-8B8cngBaLadl5lbDRdxGCP1Lef8ipD6KlxS3v0ElDAGil6lafrAM3B258p1KJOglInCVFUjk751IXMr2ixeQOQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -1812,14 +1777,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-x64-gnu@14.2.5':
-    resolution: {integrity: sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-
-  '@next/swc-linux-x64-gnu@16.1.6':
-    resolution: {integrity: sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==}
+  '@next/swc-linux-x64-gnu@15.5.14':
+    resolution: {integrity: sha512-bAS6tIAg8u4Gn3Nz7fCPpSoKAexEt2d5vn1mzokcqdqyov6ZJ6gu6GdF9l8ORFrBuRHgv3go/RfzYz5BkZ6YSQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -1830,14 +1789,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-linux-x64-musl@14.2.5':
-    resolution: {integrity: sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-
-  '@next/swc-linux-x64-musl@16.1.6':
-    resolution: {integrity: sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==}
+  '@next/swc-linux-x64-musl@15.5.14':
+    resolution: {integrity: sha512-mMxv/FcrT7Gfaq4tsR22l17oKWXZmH/lVqcvjX0kfp5I0lKodHYLICKPoX1KRnnE+ci6oIUdriUhuA3rBCDiSw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -1848,14 +1801,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-win32-arm64-msvc@14.2.5':
-    resolution: {integrity: sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@next/swc-win32-arm64-msvc@16.1.6':
-    resolution: {integrity: sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==}
+  '@next/swc-win32-arm64-msvc@15.5.14':
+    resolution: {integrity: sha512-OTmiBlYThppnvnsqx0rBqjDRemlmIeZ8/o4zI7veaXoeO1PVHoyj2lfTfXTiiGjCyRDhA10y4h6ZvZvBiynr2g==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
@@ -1866,20 +1813,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-ia32-msvc@14.2.5':
-    resolution: {integrity: sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==}
-    engines: {node: '>= 10'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@next/swc-win32-x64-msvc@14.2.5':
-    resolution: {integrity: sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-
-  '@next/swc-win32-x64-msvc@16.1.6':
-    resolution: {integrity: sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==}
+  '@next/swc-win32-x64-msvc@15.5.14':
+    resolution: {integrity: sha512-+W7eFf3RS7m4G6tppVTOSyP9Y6FsJXfOuKzav1qKniiFm3KFByQfPEcouHdjlZmysl4zJGuGLQ/M9XyVeyeNEg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -2583,15 +2518,9 @@ packages:
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@swc/counter@0.1.3':
-    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
-
   '@swc/helpers@0.5.15':
     resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
 
-  '@swc/helpers@0.5.5':
-    resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==}
-
   '@tailwindcss/node@4.1.18':
     resolution: {integrity: sha512-DoR7U1P7iYhw16qJ49fgXUlry1t4CpXeErJHnQ44JgTSKMaZUdf17cfn5mHchfJ4KRBZRFA/Coo+MUF5+gOaCQ==}
 
@@ -3001,11 +2930,15 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
+
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.10.11:
-    resolution: {integrity: sha512-DAKrHphkJyiGuau/cFieRYhcTFeK/lBuD++C7cZ6KZHbMhBrisoi+EvhQ5RZrIfV5qwsW8kgQ07JIC+MDJRAhg==}
+  baseline-browser-mapping@2.10.12:
+    resolution: {integrity: sha512-qyq26DxfY4awP2gIRXhhLWfwzwI+N5Nxk6iQi8EFizIaWIjqicQTE4sLnZZVdeKPRcVNoJOkkpfzoIYuvCKaIQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -3108,8 +3041,12 @@ packages:
   bowser@2.14.1:
     resolution: {integrity: sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==}
 
-  brace-expansion@2.0.2:
-    resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
+  brace-expansion@2.0.3:
+    resolution: {integrity: sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==}
+
+  brace-expansion@5.0.5:
+    resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
+    engines: {node: 18 || 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -3183,6 +3120,9 @@ packages:
   caniuse-lite@1.0.30001764:
     resolution: {integrity: sha512-9JGuzl2M+vPL+pz70gtMF9sHdMFbY9FJaQBi186cHKH3pSzDvzoUJUPV6fqiKIMyXbud9ZLg4F3Yza1vJ1+93g==}
 
+  caniuse-lite@1.0.30001782:
+    resolution: {integrity: sha512-dZcaJLJeDMh4rELYFw1tvSn1bhZWYFOt468FcbHHxx/Z/dFidd1I6ciyFdi3iwfQCyOjqo9upF6lGQYtMiJWxw==}
+
   chokidar@3.6.0:
     resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
     engines: {node: '>= 8.10.0'}
@@ -3962,12 +3902,12 @@ packages:
     engines: {node: '>=10.0.0'}
     hasBin: true
 
-  minimatch@10.1.1:
-    resolution: {integrity: sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==}
-    engines: {node: 20 || >=22}
+  minimatch@10.2.3:
+    resolution: {integrity: sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==}
+    engines: {node: 18 || 20 || >=22}
 
-  minimatch@8.0.4:
-    resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==}
+  minimatch@8.0.7:
+    resolution: {integrity: sha512-V+1uQNdzybxa14e/p00HZnQNNcTjnRJjDxg2V8wtkjFctq4M7hXFws4oekyTP0Jebeq7QYtpFyOeBAjc88zvYg==}
     engines: {node: '>=16 || 14 >=14.17'}
 
   minipass@4.2.8:
@@ -4021,28 +3961,9 @@ packages:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
     engines: {node: '>= 0.6'}
 
-  next@14.2.5:
-    resolution: {integrity: sha512-0f8aRfBVL+mpzfBjYfQuLWh2WyAwtJXCRfkPF4UJ5qd2YwrHczsrSzXU4tRMV0OAxR8ZJZWPFn6uhSC56UTsLA==}
-    engines: {node: '>=18.17.0'}
-    deprecated: This version has a security vulnerability. Please upgrade to a patched version. See https://nextjs.org/blog/security-update-2025-12-11 for more details.
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      '@playwright/test': ^1.41.2
-      react: ^18.2.0
-      react-dom: ^18.2.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      '@playwright/test':
-        optional: true
-      sass:
-        optional: true
-
-  next@16.1.6:
-    resolution: {integrity: sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==}
-    engines: {node: '>=20.9.0'}
+  next@15.5.14:
+    resolution: {integrity: sha512-M6S+4JyRjmKic2Ssm7jHUPkE6YUJ6lv4507jprsSZLulubz0ihO2E+S4zmQK3JZ2ov81JrugukKU4Tz0ivgqqQ==}
+    engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
     hasBin: true
     peerDependencies:
       '@opentelemetry/api': ^1.1.0
@@ -4579,19 +4500,6 @@ packages:
   style-mod@4.1.3:
     resolution: {integrity: sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==}
 
-  styled-jsx@5.1.1:
-    resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
-    engines: {node: '>= 12.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-plugin-macros: '*'
-      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      babel-plugin-macros:
-        optional: true
-
   styled-jsx@5.1.6:
     resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}
     engines: {node: '>= 12.0.0'}
@@ -6073,12 +5981,6 @@ snapshots:
   '@img/sharp-win32-x64@0.34.5':
     optional: true
 
-  '@isaacs/balanced-match@4.0.1': {}
-
-  '@isaacs/brace-expansion@5.0.0':
-    dependencies:
-      '@isaacs/balanced-match': 4.0.1
-
   '@isaacs/fs-minipass@4.0.1':
     dependencies:
       minipass: 7.1.2
@@ -6328,82 +6230,54 @@ snapshots:
 
   '@marijn/find-cluster-break@1.0.2': {}
 
-  '@next/env@14.2.5': {}
-
-  '@next/env@16.1.6': {}
-
-  '@next/env@16.2.1': {}
+  '@next/env@15.5.14': {}
 
-  '@next/swc-darwin-arm64@14.2.5':
+  '@next/env@16.2.1':
     optional: true
 
-  '@next/swc-darwin-arm64@16.1.6':
+  '@next/swc-darwin-arm64@15.5.14':
     optional: true
 
   '@next/swc-darwin-arm64@16.2.1':
     optional: true
 
-  '@next/swc-darwin-x64@14.2.5':
-    optional: true
-
-  '@next/swc-darwin-x64@16.1.6':
+  '@next/swc-darwin-x64@15.5.14':
     optional: true
 
   '@next/swc-darwin-x64@16.2.1':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@14.2.5':
-    optional: true
-
-  '@next/swc-linux-arm64-gnu@16.1.6':
+  '@next/swc-linux-arm64-gnu@15.5.14':
     optional: true
 
   '@next/swc-linux-arm64-gnu@16.2.1':
     optional: true
 
-  '@next/swc-linux-arm64-musl@14.2.5':
-    optional: true
-
-  '@next/swc-linux-arm64-musl@16.1.6':
+  '@next/swc-linux-arm64-musl@15.5.14':
     optional: true
 
   '@next/swc-linux-arm64-musl@16.2.1':
     optional: true
 
-  '@next/swc-linux-x64-gnu@14.2.5':
-    optional: true
-
-  '@next/swc-linux-x64-gnu@16.1.6':
+  '@next/swc-linux-x64-gnu@15.5.14':
     optional: true
 
   '@next/swc-linux-x64-gnu@16.2.1':
     optional: true
 
-  '@next/swc-linux-x64-musl@14.2.5':
-    optional: true
-
-  '@next/swc-linux-x64-musl@16.1.6':
+  '@next/swc-linux-x64-musl@15.5.14':
     optional: true
 
   '@next/swc-linux-x64-musl@16.2.1':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@14.2.5':
-    optional: true
-
-  '@next/swc-win32-arm64-msvc@16.1.6':
+  '@next/swc-win32-arm64-msvc@15.5.14':
     optional: true
 
   '@next/swc-win32-arm64-msvc@16.2.1':
     optional: true
 
-  '@next/swc-win32-ia32-msvc@14.2.5':
-    optional: true
-
-  '@next/swc-win32-x64-msvc@14.2.5':
-    optional: true
-
-  '@next/swc-win32-x64-msvc@16.1.6':
+  '@next/swc-win32-x64-msvc@15.5.14':
     optional: true
 
   '@next/swc-win32-x64-msvc@16.2.1':
@@ -7259,17 +7133,10 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@swc/counter@0.1.3': {}
-
   '@swc/helpers@0.5.15':
     dependencies:
       tslib: 2.8.1
 
-  '@swc/helpers@0.5.5':
-    dependencies:
-      '@swc/counter': 0.1.3
-      tslib: 2.8.1
-
   '@tailwindcss/node@4.1.18':
     dependencies:
       '@jridgewell/remapping': 2.3.5
@@ -7669,9 +7536,12 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
+  balanced-match@4.0.4: {}
+
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.10.11: {}
+  baseline-browser-mapping@2.10.12:
+    optional: true
 
   baseline-browser-mapping@2.9.14: {}
 
@@ -7728,22 +7598,26 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  botid@1.5.11(next@14.2.5(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0):
+  botid@1.5.11(next@15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0):
     optionalDependencies:
-      next: 14.2.5(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      next: 15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
 
-  botid@1.5.11(next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4):
+  botid@1.5.11(next@15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react@19.2.4):
     optionalDependencies:
-      next: 16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      next: 15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       react: 19.2.4
 
   bowser@2.14.1: {}
 
-  brace-expansion@2.0.2:
+  brace-expansion@2.0.3:
     dependencies:
       balanced-match: 1.0.2
 
+  brace-expansion@5.0.5:
+    dependencies:
+      balanced-match: 4.0.4
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -7751,7 +7625,7 @@ snapshots:
   browserslist@4.28.1:
     dependencies:
       baseline-browser-mapping: 2.9.14
-      caniuse-lite: 1.0.30001764
+      caniuse-lite: 1.0.30001782
       electron-to-chromium: 1.5.267
       node-releases: 2.0.27
       update-browserslist-db: 1.2.3(browserslist@4.28.1)
@@ -7818,6 +7692,8 @@ snapshots:
 
   caniuse-lite@1.0.30001764: {}
 
+  caniuse-lite@1.0.30001782: {}
+
   chokidar@3.6.0:
     dependencies:
       anymatch: 3.1.3
@@ -8248,7 +8124,7 @@ snapshots:
   glob@9.3.5:
     dependencies:
       fs.realpath: 1.0.0
-      minimatch: 8.0.4
+      minimatch: 8.0.7
       minipass: 4.2.8
       path-scurry: 1.11.1
 
@@ -8522,13 +8398,13 @@ snapshots:
 
   mime@3.0.0: {}
 
-  minimatch@10.1.1:
+  minimatch@10.2.3:
     dependencies:
-      '@isaacs/brace-expansion': 5.0.0
+      brace-expansion: 5.0.5
 
-  minimatch@8.0.4:
+  minimatch@8.0.7:
     dependencies:
-      brace-expansion: 2.0.2
+      brace-expansion: 2.0.3
 
   minipass@4.2.8: {}
 
@@ -8577,52 +8453,49 @@ snapshots:
 
   negotiator@0.6.3: {}
 
-  next@14.2.5(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  next@15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
-      '@next/env': 14.2.5
-      '@swc/helpers': 0.5.5
-      busboy: 1.6.0
-      caniuse-lite: 1.0.30001764
-      graceful-fs: 4.2.11
+      '@next/env': 15.5.14
+      '@swc/helpers': 0.5.15
+      caniuse-lite: 1.0.30001782
       postcss: 8.4.31
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      styled-jsx: 5.1.1(react@18.2.0)
+      styled-jsx: 5.1.6(react@18.2.0)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 14.2.5
-      '@next/swc-darwin-x64': 14.2.5
-      '@next/swc-linux-arm64-gnu': 14.2.5
-      '@next/swc-linux-arm64-musl': 14.2.5
-      '@next/swc-linux-x64-gnu': 14.2.5
-      '@next/swc-linux-x64-musl': 14.2.5
-      '@next/swc-win32-arm64-msvc': 14.2.5
-      '@next/swc-win32-ia32-msvc': 14.2.5
-      '@next/swc-win32-x64-msvc': 14.2.5
+      '@next/swc-darwin-arm64': 15.5.14
+      '@next/swc-darwin-x64': 15.5.14
+      '@next/swc-linux-arm64-gnu': 15.5.14
+      '@next/swc-linux-arm64-musl': 15.5.14
+      '@next/swc-linux-x64-gnu': 15.5.14
+      '@next/swc-linux-x64-musl': 15.5.14
+      '@next/swc-win32-arm64-msvc': 15.5.14
+      '@next/swc-win32-x64-msvc': 15.5.14
       '@opentelemetry/api': 1.9.0
       '@playwright/test': 1.58.2
+      sharp: 0.34.5
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
 
-  next@16.1.6(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+  next@15.5.14(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
-      '@next/env': 16.1.6
+      '@next/env': 15.5.14
       '@swc/helpers': 0.5.15
-      baseline-browser-mapping: 2.9.14
-      caniuse-lite: 1.0.30001764
+      caniuse-lite: 1.0.30001782
       postcss: 8.4.31
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
       styled-jsx: 5.1.6(react@19.2.4)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 16.1.6
-      '@next/swc-darwin-x64': 16.1.6
-      '@next/swc-linux-arm64-gnu': 16.1.6
-      '@next/swc-linux-arm64-musl': 16.1.6
-      '@next/swc-linux-x64-gnu': 16.1.6
-      '@next/swc-linux-x64-musl': 16.1.6
-      '@next/swc-win32-arm64-msvc': 16.1.6
-      '@next/swc-win32-x64-msvc': 16.1.6
+      '@next/swc-darwin-arm64': 15.5.14
+      '@next/swc-darwin-x64': 15.5.14
+      '@next/swc-linux-arm64-gnu': 15.5.14
+      '@next/swc-linux-arm64-musl': 15.5.14
+      '@next/swc-linux-x64-gnu': 15.5.14
+      '@next/swc-linux-x64-musl': 15.5.14
+      '@next/swc-win32-arm64-msvc': 15.5.14
+      '@next/swc-win32-x64-msvc': 15.5.14
       '@opentelemetry/api': 1.9.0
       '@playwright/test': 1.58.2
       sharp: 0.34.5
@@ -8634,8 +8507,8 @@ snapshots:
     dependencies:
       '@next/env': 16.2.1
       '@swc/helpers': 0.5.15
-      baseline-browser-mapping: 2.10.11
-      caniuse-lite: 1.0.30001764
+      baseline-browser-mapping: 2.10.12
+      caniuse-lite: 1.0.30001782
       postcss: 8.4.31
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
@@ -8655,6 +8528,7 @@ snapshots:
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
+    optional: true
 
   node-fetch@2.7.0:
     dependencies:
@@ -9188,7 +9062,7 @@ snapshots:
 
   style-mod@4.1.3: {}
 
-  styled-jsx@5.1.1(react@18.2.0):
+  styled-jsx@5.1.6(react@18.2.0):
     dependencies:
       client-only: 0.0.1
       react: 18.2.0