chore: merge dev into v2

packages/app/src/components/help-button.tsx

@@ -32,8 +32,6 @@ const triggerClass =
 const showPopover = () => true
 
 export function HelpButton() {
-  if (import.meta.env.VITE_OPENCODE_CHANNEL !== "dev") return null
-
   const platform = usePlatform()
 
   return (
@@ -56,6 +54,7 @@ export function HelpButton() {
 // can remove this after the tabs rollout has been out for a while
 export function TabsInfoPopup() {
   const settings = useSettings()
+  const platform = usePlatform()
   const [drawerOpen, setDrawerOpen] = createSignal(false)
 
   return (
@@ -114,16 +113,18 @@ export function TabsInfoPopup() {
       <DrawerContent>
         <div class="flex h-[52px] w-full shrink-0 items-center gap-4 self-stretch border-b border-v2-border-border-muted p-4">
           <p class="min-h-0 min-w-0 flex-1 text-[13px] font-[530] leading-5 tracking-[-0.04px] tabular-nums text-v2-text-text-muted">
-            June 16
+            July 14
           </p>
-          <DrawerClose
-            as={IconButtonV2}
-            type="button"
-            size="small"
-            variant="ghost-muted"
-            aria-label="Close"
-            icon={<IconV2 name="xmark-small" />}
-          />
+          <Show when={platform.platform !== "desktop" || platform.os !== "windows"}>
+            <DrawerClose
+              as={IconButtonV2}
+              type="button"
+              size="small"
+              variant="ghost-muted"
+              aria-label="Close"
+              icon={<IconV2 name="xmark-small" />}
+            />
+          </Show>
         </div>
         <div class="relative flex min-h-0 w-full flex-1 flex-col items-start gap-6 overflow-y-auto p-8">
           <p class="w-full shrink-0 self-stretch text-[21px] font-[610] leading-6 tracking-[-0.37px] tabular-nums text-v2-text-text-base">
@@ -147,7 +148,7 @@ export function TabsInfoPopup() {
             <p>When you reopen the app, your tabs are still open.</p>
             <p>
               The new design does not support Git Worktrees yet, it's coming soon. So if you'd prefer to continue using
-              the previous layout , you can switch between layouts in Settings. Just keep in mind that the new layout
+              the previous layout, you can switch between layouts in Settings. Just keep in mind that the new layout
               will become permanent in a few weeks.
             </p>
           </div>

packages/app/src/components/settings-v2/settings-v2.css

@@ -371,7 +371,7 @@
   transform: translateY(-50%);
 }
 
-.settings-v2-tab-body.settings-v2-models {
+.settings-v2-models {
   gap: 24px;
 }
 

packages/app/src/components/titlebar.tsx

@@ -392,7 +392,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                   id: "tab.new",
                   category: "tab",
                   title: language.t("command.session.new"),
-                  keybind: "mod+t",
+                  keybind: "mod+t,mod+n",
                   hidden: true,
                   onSelect: openNewTab,
                 },