diff --git a/packages/app/e2e/commands/panels.spec.ts b/packages/app/e2e/commands/panels.spec.ts
index 20ea347a5..8ba762dc3 100644
--- a/packages/app/e2e/commands/panels.spec.ts
+++ b/packages/app/e2e/commands/panels.spec.ts
@@ -1,12 +1,13 @@
 import { test, expect } from "../fixtures"
-import { titlebarRightSelector } from "../selectors"
+import { openSidebar } from "../actions"
+import { pawworkSessionNewSelector, titlebarRightSelector } from "../selectors"
 import { modKey } from "../utils"
 
 test("desktop right-panel tabs switch between review and files within a unified utility shell", async ({ page, gotoSession }) => {
   await gotoSession()
 
   const rightToggle = page.locator(`${titlebarRightSelector} button`).first()
-  const rightPanel = page.locator("#right-panel")
+  const rightPanel = page.locator('[data-component="right-panel"]')
   await expect(rightToggle).toBeVisible()
   await expect(rightPanel).toHaveAttribute("aria-hidden", "true")
 
@@ -36,6 +37,22 @@ test("desktop right-panel tabs switch between review and files within a unified
   await expect(reviewTab).toHaveAttribute("aria-selected", "true")
 })
 
+test("desktop remains clickable after right-panel resize ends with mouseup", async ({ page, gotoSession, slug }) => {
+  await gotoSession()
+  await openSidebar(page)
+
+  const rightPanel = page.locator("#right-panel")
+  await page.keyboard.press(`${modKey}+Shift+R`)
+  await expect(rightPanel).toHaveAttribute("aria-hidden", "false")
+
+  await page.locator('[data-component="right-panel-resize-wrapper"]').dispatchEvent("pointerdown")
+  await page.mouse.up()
+
+  await page.locator(pawworkSessionNewSelector).click()
+  await expect(page).toHaveURL(new RegExp(`/${slug}/session(?:\\?|#|$)`))
+  await expect(page.locator('[data-component="session-new-home"]')).toBeVisible()
+})
+
 test("desktop session keeps a single right-panel toggle and icon-first utility tabs", async ({ page, gotoSession }) => {
   await gotoSession()
 
diff --git a/packages/app/e2e/sidebar/sidebar-session-links.spec.ts b/packages/app/e2e/sidebar/sidebar-session-links.spec.ts
index d9120cdac..09d331ce6 100644
--- a/packages/app/e2e/sidebar/sidebar-session-links.spec.ts
+++ b/packages/app/e2e/sidebar/sidebar-session-links.spec.ts
@@ -1,7 +1,21 @@
+import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
 import { cleanupSession, cleanupTestProject, createTestProject, openSidebar, waitSession } from "../actions"
 import { promptSelector } from "../selectors"
 
+async function expectUrlToStayMatched(page: Page, pattern: RegExp, stableFor = 300) {
+  let stableSince = Date.now()
+  await expect
+    .poll(() => {
+      if (!pattern.test(page.url())) {
+        stableSince = Date.now()
+        return false
+      }
+      return Date.now() - stableSince >= stableFor
+    })
+    .toBe(true)
+}
+
 test("sidebar session links navigate to the selected session", async ({ page, slug, sdk, gotoSession }) => {
   const stamp = Date.now()
 
@@ -20,9 +34,15 @@ test("sidebar session links navigate to the selected session", async ({ page, sl
     await expect(target).toBeVisible()
     await target.click()
 
-    await expect(page).toHaveURL(new RegExp(`/${slug}/session/${two.id}(?:\\?|#|$)`))
+    const selectedSessionUrl = new RegExp(`/${slug}/session/${two.id}(?:\\?|#|$)`)
+    await expect(page).toHaveURL(selectedSessionUrl)
+    await expectUrlToStayMatched(page, selectedSessionUrl)
     await expect(page.locator(promptSelector)).toBeVisible()
     await expect(page.locator(`[data-session-id="${two.id}"] a`).first()).toHaveClass(/\bactive\b/)
+
+    await page.locator('[data-action="pawwork-session-new"]').click()
+    await expect(page).toHaveURL(new RegExp(`/${slug}/session(?:\\?|#|$)`))
+    await expect(page.locator('[data-component="session-new-home"]')).toBeVisible()
   } finally {
     await cleanupSession({ sdk, sessionID: one.id })
     await cleanupSession({ sdk, sessionID: two.id })
diff --git a/packages/app/src/pages/layout.tsx b/packages/app/src/pages/layout.tsx
index c5116723f..8d5cbf198 100644
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -94,6 +94,7 @@ import { PawworkTitlebar } from "./layout/pawwork-titlebar"
 import { SettingsPage, type SettingsPageTab } from "@/components/settings-page"
 import { DialogDeleteSession } from "@/components/dialog-delete-session"
 import { sessionTitle } from "@/utils/session-title"
+import { sizingStopEvents } from "@/pages/session/helpers"
 
 export default function Layout(props: ParentProps) {
   const [store, setStore, , ready] = persisted(
@@ -192,9 +193,7 @@ export default function Layout(props: ParentProps) {
 
   onMount(() => {
     const stop = () => setState("sizing", false)
-    makeEventListener(window, "pointerup", stop)
-    makeEventListener(window, "pointercancel", stop)
-    makeEventListener(window, "blur", stop)
+    for (const event of sizingStopEvents) makeEventListener(window, event, stop)
   })
 
   createEffect(() => {
diff --git a/packages/app/src/pages/session/helpers.test.ts b/packages/app/src/pages/session/helpers.test.ts
index 6c05d49e5..ad7b8f6eb 100644
--- a/packages/app/src/pages/session/helpers.test.ts
+++ b/packages/app/src/pages/session/helpers.test.ts
@@ -7,6 +7,7 @@ import {
   createSessionTabs,
   focusTerminalById,
   getTabReorderIndex,
+  sizingStopEvents,
   shouldFocusTerminalOnKeyDown,
 } from "./helpers"
 
@@ -117,6 +118,12 @@ describe("getTabReorderIndex", () => {
   })
 })
 
+describe("createSizing", () => {
+  test("listens for mouse and touch endings as resize fallbacks", () => {
+    expect(sizingStopEvents).toEqual(["pointerup", "pointercancel", "mouseup", "touchend", "touchcancel", "blur"])
+  })
+})
+
 describe("createSessionTabs", () => {
   test("normalizes the effective file tab", () => {
     createRoot((dispose) => {
diff --git a/packages/app/src/pages/session/helpers.ts b/packages/app/src/pages/session/helpers.ts
index 5637f5f3b..9710adca8 100644
--- a/packages/app/src/pages/session/helpers.ts
+++ b/packages/app/src/pages/session/helpers.ts
@@ -153,6 +153,8 @@ export const getTabReorderIndex = (tabs: readonly string[], from: string, to: st
   return toIndex
 }
 
+export const sizingStopEvents = ["pointerup", "pointercancel", "mouseup", "touchend", "touchcancel", "blur"] as const
+
 export const createSizing = () => {
   const [state, setState] = createStore({ active: false })
   let t: number | undefined
@@ -174,9 +176,7 @@ export const createSizing = () => {
   }
 
   onMount(() => {
-    makeEventListener(window, "pointerup", stop)
-    makeEventListener(window, "pointercancel", stop)
-    makeEventListener(window, "blur", stop)
+    for (const event of sizingStopEvents) makeEventListener(window, event, stop)
   })
 
   onCleanup(() => {
diff --git a/packages/app/src/pages/session/session-side-panel.tsx b/packages/app/src/pages/session/session-side-panel.tsx
index f928eb92d..86d43d670 100644
--- a/packages/app/src/pages/session/session-side-panel.tsx
+++ b/packages/app/src/pages/session/session-side-panel.tsx
@@ -263,6 +263,7 @@ export function SessionSidePanel(props: {
     <Show when={isDesktop()}>
       <aside
         id="right-panel"
+        data-component="right-panel"
         aria-label={language.t("session.panel.utility")}
         aria-hidden={!open()}
         inert={!open()}
@@ -275,7 +276,7 @@ export function SessionSidePanel(props: {
         style={{ width: panelWidth() }}
       >
         <div
-          data-testid="right-panel-resize-wrapper"
+          data-component="right-panel-resize-wrapper"
           onPointerDown={() => props.size.start()}
           class="absolute top-0 left-0 h-full z-10"
         >
diff --git a/packages/desktop-electron/electron-builder-app-update.test.ts b/packages/desktop-electron/electron-builder-app-update.test.ts
index 319cf5d5e..556bb0aa3 100644
--- a/packages/desktop-electron/electron-builder-app-update.test.ts
+++ b/packages/desktop-electron/electron-builder-app-update.test.ts
@@ -4,7 +4,12 @@ import { tmpdir } from "node:os"
 import { join } from "node:path"
 
 import type { Configuration } from "electron-builder"
-import { createConfig, getPublishConfig } from "./electron-builder.config"
+import {
+  createConfig,
+  getPublishConfig,
+  nativeWatcherFileSets,
+  nativeWatcherPackageNames,
+} from "./electron-builder.config"
 import { serializeAppUpdateConfig } from "./scripts/write-app-update-config"
 
 const roots: string[] = []
@@ -74,6 +79,38 @@ describe("electron builder app-update config", () => {
     )
   })
 
+  test("native watcher package list covers desktop targets", () => {
+    expect(nativeWatcherPackageNames()).toEqual([
+      "@parcel/watcher-darwin-arm64",
+      "@parcel/watcher-darwin-x64",
+      "@parcel/watcher-linux-arm64-glibc",
+      "@parcel/watcher-linux-arm64-musl",
+      "@parcel/watcher-linux-x64-glibc",
+      "@parcel/watcher-linux-x64-musl",
+      "@parcel/watcher-win32-arm64",
+      "@parcel/watcher-win32-x64",
+    ])
+  })
+
+  test("packages native file watcher bindings for the embedded server", () => {
+    const config = createConfig("prod")
+    const resources = nativeWatcherFileSets()
+
+    expect(config.extraResources).toEqual(
+      expect.arrayContaining(
+        resources.map((resource) =>
+          expect.objectContaining({
+            from: resource.from,
+            to: resource.to,
+          }),
+        ),
+      ),
+    )
+    expect(resources.map((resource) => resource.to)).toEqual(
+      nativeWatcherPackageNames().map((packageName) => join("node_modules", ...packageName.split("/"))),
+    )
+  })
+
   test("afterPack writes app-update.yml to the packager-reported macOS resources path", async () => {
     const root = mkdtempSync(join(tmpdir(), "pawwork-builder-config-"))
     roots.push(root)
diff --git a/packages/desktop-electron/electron-builder.config.ts b/packages/desktop-electron/electron-builder.config.ts
index 1b158413a..40502a201 100644
--- a/packages/desktop-electron/electron-builder.config.ts
+++ b/packages/desktop-electron/electron-builder.config.ts
@@ -1,5 +1,6 @@
 import { execFile } from "node:child_process"
 import { mkdir, writeFile } from "node:fs/promises"
+import { createRequire } from "node:module"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
 import { promisify } from "node:util"
@@ -10,6 +11,11 @@ import { writeAppUpdateConfig, type GitHubPublishConfig } from "./scripts/write-
 const execFileAsync = promisify(execFile)
 const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..")
 const signScript = path.join(rootDir, "script", "sign-windows.ps1")
+const requireFromOpencode = createRequire(path.join(rootDir, "packages", "opencode", "package.json"))
+const opencodePackage = requireFromOpencode("./package.json") as {
+  dependencies?: Record<string, string>
+  devDependencies?: Record<string, string>
+}
 type Channel = "dev" | "beta" | "prod"
 const localizedMacDisplayNameByChannel: Record<Channel, string> = {
   dev: "爪印 Dev",
@@ -34,6 +40,50 @@ function currentChannel(): Channel {
   return "dev"
 }
 
+const nativeWatcherPackages = [
+  "@parcel/watcher-darwin-arm64",
+  "@parcel/watcher-darwin-x64",
+  "@parcel/watcher-linux-arm64-glibc",
+  "@parcel/watcher-linux-arm64-musl",
+  "@parcel/watcher-linux-x64-glibc",
+  "@parcel/watcher-linux-x64-musl",
+  "@parcel/watcher-win32-arm64",
+  "@parcel/watcher-win32-x64",
+] as const
+
+export function nativeWatcherPackageNames() {
+  return [...nativeWatcherPackages]
+}
+
+function bunPackageFallbackDir(packageName: string) {
+  const version = opencodePackage.devDependencies?.[packageName] ?? opencodePackage.dependencies?.[packageName]
+  if (!version) throw new Error(`Missing ${packageName} in packages/opencode/package.json`)
+  return path.join(
+    rootDir,
+    "node_modules",
+    ".bun",
+    `${packageName.replace("/", "+")}@${version}`,
+    "node_modules",
+    ...packageName.split("/"),
+  )
+}
+
+function nativeWatcherPackageDir(packageName: string) {
+  try {
+    return path.dirname(requireFromOpencode.resolve(`${packageName}/package.json`))
+  } catch {
+    return bunPackageFallbackDir(packageName)
+  }
+}
+
+export function nativeWatcherFileSets() {
+  return nativeWatcherPackages.map((packageName) => ({
+    from: nativeWatcherPackageDir(packageName),
+    to: path.join("node_modules", ...packageName.split("/")),
+    filter: ["**/*"],
+  }))
+}
+
 export function getPublishConfig(channel: Channel): GitHubPublishConfig | undefined {
   if (channel === "beta") return { provider: "github", owner: "Astro-Han", repo: "pawwork-beta", channel: "latest" }
   if (channel === "prod") return { provider: "github", owner: "Astro-Han", repo: "pawwork", channel: "latest" }
@@ -59,6 +109,7 @@ const getBase = (): Configuration => ({
   },
   files: ["out/**/*", "resources/**/*"],
   extraResources: [
+    ...nativeWatcherFileSets(),
     {
       from: path.join(rootDir, "skills"),
       to: "skills",
diff --git a/packages/desktop-electron/scripts/prepare-embedded-server.ts b/packages/desktop-electron/scripts/prepare-embedded-server.ts
index cc14cc9a0..8e1031768 100644
--- a/packages/desktop-electron/scripts/prepare-embedded-server.ts
+++ b/packages/desktop-electron/scripts/prepare-embedded-server.ts
@@ -4,4 +4,5 @@ import { resolveOpencodeRoot } from "./embedded-server-path"
 
 const opencodeRoot = resolveOpencodeRoot(import.meta.dir)
 
+await $`bun install --cwd ${opencodeRoot} --os="*" --cpu="*" --frozen-lockfile`
 await $`bun run --cwd ${opencodeRoot} build:embedded-server`