diff --git a/docs/docs/durable-sessions.mdx b/docs/docs/durable-sessions.mdx
new file mode 100644
index 0000000000..6b74362abe
--- /dev/null
+++ b/docs/docs/durable-sessions.mdx
@@ -0,0 +1,216 @@
+---
+sidebar_position: 3.5
+id: "durable-sessions"
+title: "Durable Sessions"
+---
+
+import { VersionBadge } from "@site/src/components/versionbadge";
+
+# Durable Sessions <VersionBadge version="v0.14" />
+
+Keep your remote SSH shell sessions alive through network changes, computer sleep, and Wave restarts.
+
+## Overview
+
+:::info Remote Connections Only
+Durable sessions are designed for **remote SSH connections only**. Local terminals and WSL connections use standard sessions, as they're not affected by network interruptions and remain active as long as Wave is running.
+:::
+
+Durable sessions protect your terminal state when working with remote SSH connections, similar to tmux or screen but built directly into Wave. Unlike standard SSH sessions that terminate when the connection drops, durable sessions maintain your:
+
+- **Shell state** - Current directory, environment variables, and shell history
+- **Running programs** - Background jobs and long-running commands continue executing
+- **Terminal history** - Full scrollback buffer preserved across reconnections
+
+Durable sessions automatically reconnect when your connection is restored, picking up right where you left off.
+
+## How It Works
+
+When you start a durable session, Wave launches a persistent job manager on the remote server. This manager:
+
+1. Keeps your shell process running independently of the Wave connection
+2. Buffers terminal output while disconnected
+3. Automatically reattaches when you reconnect
+4. Survives Wave restarts and network interruptions
+
+The session continues running on the remote server even if you close Wave, put your computer to sleep, or switch networks.
+
+## Session Status Indicator
+
+The shield icon in your terminal header shows the current session status:
+
+| Icon | Status | Description |
+|------|--------|-------------|
+| <i className="fa-sharp fa-regular fa-shield text-muted"></i> | Standard Session | Connection drops will end the session |
+| <i className="fa-sharp fa-solid fa-shield text-sky-500"></i> | Durable (Attached) | Session is protected and connected |
+| <i className="fa-sharp fa-solid fa-shield text-sky-300"></i> | Durable (Detached) | Session running, currently disconnected |
+| <i className="fa-sharp fa-solid fa-shield text-muted"></i> | Durable (Awaiting) | Configured but not yet started |
+
+Hover over the shield icon to see detailed status information and available actions.
+
+## Configuration
+
+Durable sessions can be configured at three levels, with more specific settings overriding general ones:
+
+### Global Settings (Lowest Priority)
+
+Set the default for all SSH connections in your `settings.json`:
+
+```json
+{
+  "term:durable": true
+}
+```
+
+### Connection Settings (Medium Priority)
+
+Configure durability per connection in your `connections.json`:
+
+```json
+{
+  "connections": {
+    "user@host": {
+      "term:durable": true
+    }
+  }
+}
+```
+
+### Block Settings (Highest Priority)
+
+Override for individual terminal blocks through:
+
+- **Context Menu**: Right-click terminal → Advanced → Session Durability
+- **Flyover Actions**: Click shield icon → "Restart as Durable" or "Restart as Standard"
+- **Command Line**: Use `wsh setmeta term:durable=true` or `wsh setmeta term:durable=false`
+
+Configuration hierarchy (highest to lowest priority):
+1. Block-level setting
+2. Connection-level setting  
+3. Global setting
+
+### Default Behavior
+
+- **SSH connections**: Durable sessions disabled by default (opt-in via configuration)
+- **Local terminals**: Always use standard sessions (durability not applicable)
+- **WSL connections**: Always use standard sessions (durability not applicable)
+
+## Switching Between Modes
+
+### Standard to Durable
+
+1. Hover over the regular shield icon
+2. Click **"Restart as Durable"** in the flyover
+3. Your session will restart with durability enabled
+
+Or use the context menu:
+- Right-click terminal → Advanced → Session Durability → Restart Session in Durable Mode
+
+### Durable to Standard
+
+1. Access the terminal context menu (right-click)
+2. Navigate to Advanced → Session Durability
+3. Select **"Restart Session in Standard Mode"**
+
+:::warning Switching Modes Restarts the Session
+Converting between standard and durable modes requires restarting the shell. Any running processes in the current session will be terminated.
+:::
+
+## Session States
+
+### Attached
+Your terminal is connected to the remote session. You can interact with the shell and see real-time output.
+
+### Detached
+Connection lost, but the session continues running on the remote server. Wave will automatically reconnect when possible. Any commands you ran continue executing.
+
+### Awaiting Start
+Session configured for durability but not yet started. Click "Start Session" or run a command to begin.
+
+### Starting
+Job manager is initializing on the remote server. The session will become attached shortly.
+
+### Ended
+Session has terminated. Common reasons:
+- **Exited**: Shell was closed normally (e.g., typed `exit`)
+- **Lost**: Session not found on server (may have been terminated or system rebooted)
+- **Failed to Start**: Job manager encountered an error during initialization
+
+Click "Restart Session" to start a new durable session, or "Restart as Standard" to switch modes.
+
+## Use Cases
+
+### Long-Running Commands
+Start a build, deployment, or data processing job and close your laptop. The command continues executing, and you can check on it later.
+
+```bash
+# Start a long build
+./build.sh
+
+# Close your laptop, get coffee
+# Later: reconnect and see the completed output
+```
+
+### Unstable Networks
+Work from a café, train, or cellular connection. Brief disconnections won't terminate your session or lose your work.
+
+### Multiple Locations
+Start work on your desktop, continue on your laptop. Your session and its state are preserved on the remote server.
+
+### System Maintenance
+Wave updates, restarts, or crashes won't interrupt your remote work. Reconnect and resume immediately.
+
+## Session Lifecycle
+
+Durable sessions are tied to the terminal block in Wave. The session will be terminated when you:
+
+- **Close the block**: Closes the terminal and terminates the remote session
+- **Switch connections**: Changing the connection on a block terminates the old session
+- **Delete the workspace/tab**: Removes the block and terminates associated sessions
+
+### Cleanup Behavior
+
+If you close a block while **disconnected**, the remote session continues running until the next reconnection. When Wave reconnects to that server, it will automatically clean up any orphaned sessions from closed blocks.
+
+This ensures that remote sessions don't accumulate on your servers when you close terminals while offline.
+
+## Limitations
+
+- **Local terminals**: Not applicable (already persistent with your local machine)
+- **WSL connections**: Not applicable (WSL sessions managed by Windows)
+- **Network latency**: Detached sessions buffer output; reconnecting may take a moment to sync
+- **Server resources**: Each durable session maintains a lightweight Go process on the remote server for session management
+
+## Troubleshooting
+
+### Session Shows as "Lost"
+The session was terminated on the remote server, possibly due to:
+- Server reboot
+- Manual termination of the job manager process
+- Remote system running out of resources
+
+**Solution**: Click "Restart Session" to start a new durable session.
+
+### Session Won't Reconnect
+Verify that:
+- Your SSH connection to the server is working (check the connection status)
+- The job manager process is still running on the remote server
+
+**Try**: Right-click terminal → Advanced → Force Restart Controller
+
+### "Failed to Start" Error
+The job manager couldn't initialize on the remote server. Check the error message for specific details.
+
+**Try**: Restart the session. If the issue persists, file a bug report with the error details.
+
+:::info Technical Details
+Durable sessions use Unix domain sockets on the remote server to maintain persistent connections between the shell and Wave's job manager. The job manager process runs independently and survives SSH disconnections.
+:::
+
+## Privacy & Security
+
+- Durable sessions run entirely on your remote servers
+- All data is transmitted over SSH between your local Wave instance and the remote machine
+- No open ports on the remote machine - communication happens through your existing SSH connection
+- When disconnected, output is buffered locally on the remote machine until you reconnect
+- Sessions are isolated per user and use your remote user's permissions
diff --git a/frontend/app/block/durable-session-flyover.tsx b/frontend/app/block/durable-session-flyover.tsx
index 06626723fa..620c57731f 100644
--- a/frontend/app/block/durable-session-flyover.tsx
+++ b/frontend/app/block/durable-session-flyover.tsx
@@ -24,7 +24,7 @@ function isTermViewModel(viewModel: ViewModel): viewModel is TermViewModel {
 }
 
 function handleLearnMore() {
-    getApi().openExternal("https://docs.waveterm.dev/features/durable-sessions");
+    getApi().openExternal("https://docs.waveterm.dev/durable-sessions");
 }
 
 function LearnMoreButton() {
diff --git a/frontend/app/onboarding/onboarding-durable.tsx b/frontend/app/onboarding/onboarding-durable.tsx
new file mode 100644
index 0000000000..9a4286f8fd
--- /dev/null
+++ b/frontend/app/onboarding/onboarding-durable.tsx
@@ -0,0 +1,125 @@
+// Copyright 2026, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import Logo from "@/app/asset/logo.svg";
+import { EmojiButton } from "@/app/element/emojibutton";
+import { RpcApi } from "@/app/store/wshclientapi";
+import { TabRpcClient } from "@/app/store/wshrpcutil";
+import { useState } from "react";
+import { CurrentOnboardingVersion } from "./onboarding-common";
+import { OnboardingFooter } from "./onboarding-features-footer";
+
+export const DurableSessionPage = ({
+    onNext,
+    onSkip,
+    onPrev,
+}: {
+    onNext: () => void;
+    onSkip: () => void;
+    onPrev?: () => void;
+}) => {
+    const [fireClicked, setFireClicked] = useState(false);
+
+    const handleFireClick = () => {
+        setFireClicked(!fireClicked);
+        if (!fireClicked) {
+            RpcApi.RecordTEventCommand(TabRpcClient, {
+                event: "onboarding:fire",
+                props: {
+                    "onboarding:feature": "durable",
+                    "onboarding:version": CurrentOnboardingVersion,
+                },
+            });
+        }
+    };
+
+    return (
+        <div className="flex flex-col h-full">
+            <header className="flex items-center gap-4 mb-6 w-full unselectable flex-shrink-0">
+                <div>
+                    <Logo />
+                </div>
+                <div className="text-[25px] font-normal text-foreground">Durable SSH Sessions</div>
+            </header>
+            <div className="flex-1 flex flex-row gap-0 min-h-0">
+                <div className="flex-1 flex flex-col items-center justify-center gap-8 pr-6 unselectable">
+                    <div className="flex flex-col items-start gap-6 max-w-md">
+                        <div className="flex h-[52px] ml-[-4px] pl-3 pr-4 items-center rounded-lg bg-hover text-[18px]">
+                            <i className="fa-sharp fa-solid fa-shield text-sky-500" />
+                            <span className="font-bold ml-2 text-primary">Your SSH Sessions, Protected</span>
+                        </div>
+
+                        <div className="flex flex-col items-start gap-4 text-secondary">
+                            <p>Close your laptop, switch networks, restart Wave — your remote sessions keep running.</p>
+
+                            <div className="flex items-start gap-3 w-full">
+                                <i className="fa-sharp fa-solid fa-link text-accent text-lg mt-1 flex-shrink-0" />
+                                <p>Shell state, running programs, and terminal history are all preserved</p>
+                            </div>
+
+                            <div className="flex items-start gap-3 w-full">
+                                <i className="fa-sharp fa-solid fa-rotate text-accent text-lg mt-1 flex-shrink-0" />
+                                <p>Sessions automatically reconnect when your connection is restored</p>
+                            </div>
+
+                            <div className="flex items-start gap-3 w-full">
+                                <i className="fa-sharp fa-solid fa-box text-accent text-lg mt-1 flex-shrink-0" />
+                                <p>Buffered output streams back in — you never miss a line</p>
+                            </div>
+
+                            <p className="italic">
+                                All the persistence of tmux, built into your terminal. Look for the shield icon to
+                                enable durability on any SSH session.
+                            </p>
+
+                            <EmojiButton emoji="🔥" isClicked={fireClicked} onClick={handleFireClick} />
+                        </div>
+                    </div>
+                </div>
+                <div className="w-[2px] bg-border flex-shrink-0"></div>
+                <div className="flex items-center justify-center pl-6 flex-shrink-0 w-[400px]">
+                    <div className="flex flex-col gap-6 text-secondary">
+                        <div className="text-lg font-semibold text-foreground">Session States</div>
+
+                        <div className="flex items-start gap-3">
+                            <i className="fa-sharp fa-solid fa-shield text-sky-500 text-xl mt-0.5" />
+                            <div>
+                                <div className="font-semibold text-foreground">Attached</div>
+                                <div className="text-sm">Session is protected and connected</div>
+                            </div>
+                        </div>
+
+                        <div className="flex items-start gap-3">
+                            <i className="fa-sharp fa-solid fa-shield text-sky-300 text-xl mt-0.5" />
+                            <div>
+                                <div className="font-semibold text-foreground">Detached</div>
+                                <div className="text-sm">Session running, currently disconnected</div>
+                            </div>
+                        </div>
+
+                        <div className="flex items-start gap-3">
+                            <i className="fa-sharp fa-regular fa-shield text-muted text-xl mt-0.5" />
+                            <div>
+                                <div className="font-semibold text-foreground">Standard</div>
+                                <div className="text-sm">Connection drops will end the session</div>
+                            </div>
+                        </div>
+
+                        <div className="mt-4 p-4 bg-hover rounded-lg border border-border/50">
+                            <div className="text-sm">
+                                <div className="font-semibold text-foreground mb-2">Common use cases:</div>
+                                <ul className="space-y-1.5 ml-2">
+                                    <li>• Alternative to tmux or screen</li>
+                                    <li>• Long-running builds and deployments</li>
+                                    <li>• Working from unstable networks</li>
+                                    <li>• Surviving Wave restarts</li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <OnboardingFooter currentStep={2} totalSteps={4} onNext={onNext} onPrev={onPrev} onSkip={onSkip} />
+        </div>
+    );
+};
diff --git a/frontend/app/onboarding/onboarding-features-footer.tsx b/frontend/app/onboarding/onboarding-features-footer.tsx
new file mode 100644
index 0000000000..91909f6b53
--- /dev/null
+++ b/frontend/app/onboarding/onboarding-features-footer.tsx
@@ -0,0 +1,49 @@
+// Copyright 2026, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import { Button } from "@/app/element/button";
+
+export const OnboardingFooter = ({
+    currentStep,
+    totalSteps,
+    onNext,
+    onPrev,
+    onSkip,
+}: {
+    currentStep: number;
+    totalSteps: number;
+    onNext: () => void;
+    onPrev?: () => void;
+    onSkip?: () => void;
+}) => {
+    const isLastStep = currentStep === totalSteps;
+    const buttonText = isLastStep ? "Get Started" : "Next";
+
+    return (
+        <footer className="unselectable flex-shrink-0 mt-5 relative">
+            <div className="absolute left-0 top-1/2 -translate-y-1/2 flex items-center gap-2">
+                {currentStep > 1 && onPrev && (
+                    <button className="text-muted cursor-pointer hover:text-foreground text-[13px]" onClick={onPrev}>
+                        &lt; Prev
+                    </button>
+                )}
+                <span className="text-muted text-[13px]">
+                    {currentStep} of {totalSteps}
+                </span>
+            </div>
+            <div className="flex flex-row items-center justify-center [&>button]:!px-5 [&>button]:!py-2 [&>button]:text-sm">
+                <Button className="font-[600]" onClick={onNext}>
+                    {buttonText}
+                </Button>
+            </div>
+            {!isLastStep && onSkip && (
+                <button
+                    className="absolute right-0 top-1/2 -translate-y-1/2 text-muted cursor-pointer hover:text-muted-hover text-[13px]"
+                    onClick={onSkip}
+                >
+                    Skip Feature Tour &gt;
+                </button>
+            )}
+        </footer>
+    );
+};
diff --git a/frontend/app/onboarding/onboarding-features.tsx b/frontend/app/onboarding/onboarding-features.tsx
index 7bd51788b2..595a69938d 100644
--- a/frontend/app/onboarding/onboarding-features.tsx
+++ b/frontend/app/onboarding/onboarding-features.tsx
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Logo from "@/app/asset/logo.svg";
-import { Button } from "@/app/element/button";
 import { EmojiButton } from "@/app/element/emojibutton";
 import { MagnifyIcon } from "@/app/element/magnify";
 import { ClientModel } from "@/app/store/client-model";
@@ -14,54 +13,11 @@ import { useEffect, useState } from "react";
 import { FakeChat } from "./fakechat";
 import { EditBashrcCommand, ViewLogoCommand, ViewShortcutsCommand } from "./onboarding-command";
 import { CurrentOnboardingVersion } from "./onboarding-common";
+import { DurableSessionPage } from "./onboarding-durable";
+import { OnboardingFooter } from "./onboarding-features-footer";
 import { FakeLayout } from "./onboarding-layout";
 
-type FeaturePageName = "waveai" | "magnify" | "files";
-
-const OnboardingFooter = ({
-    currentStep,
-    totalSteps,
-    onNext,
-    onPrev,
-    onSkip,
-}: {
-    currentStep: number;
-    totalSteps: number;
-    onNext: () => void;
-    onPrev?: () => void;
-    onSkip?: () => void;
-}) => {
-    const isLastStep = currentStep === totalSteps;
-    const buttonText = isLastStep ? "Get Started" : "Next";
-
-    return (
-        <footer className="unselectable flex-shrink-0 mt-5 relative">
-            <div className="absolute left-0 top-1/2 -translate-y-1/2 flex items-center gap-2">
-                {currentStep > 1 && onPrev && (
-                    <button className="text-muted cursor-pointer hover:text-foreground text-[13px]" onClick={onPrev}>
-                        &lt; Prev
-                    </button>
-                )}
-                <span className="text-muted text-[13px]">
-                    {currentStep} of {totalSteps}
-                </span>
-            </div>
-            <div className="flex flex-row items-center justify-center [&>button]:!px-5 [&>button]:!py-2 [&>button]:text-sm">
-                <Button className="font-[600]" onClick={onNext}>
-                    {buttonText}
-                </Button>
-            </div>
-            {!isLastStep && onSkip && (
-                <button
-                    className="absolute right-0 top-1/2 -translate-y-1/2 text-muted cursor-pointer hover:text-muted-hover text-[13px]"
-                    onClick={onSkip}
-                >
-                    Skip Feature Tour &gt;
-                </button>
-            )}
-        </footer>
-    );
-};
+type FeaturePageName = "waveai" | "durable" | "magnify" | "files";
 
 const WaveAIPage = ({ onNext, onSkip }: { onNext: () => void; onSkip: () => void }) => {
     const isMac = isMacOS();
@@ -145,7 +101,7 @@ const WaveAIPage = ({ onNext, onSkip }: { onNext: () => void; onSkip: () => void
                     </div>
                 </div>
             </div>
-            <OnboardingFooter currentStep={1} totalSteps={3} onNext={onNext} onSkip={onSkip} />
+            <OnboardingFooter currentStep={1} totalSteps={4} onNext={onNext} onSkip={onSkip} />
         </div>
     );
 };
@@ -211,7 +167,7 @@ const MagnifyBlocksPage = ({
                     <FakeLayout />
                 </div>
             </div>
-            <OnboardingFooter currentStep={2} totalSteps={3} onNext={onNext} onPrev={onPrev} onSkip={onSkip} />
+            <OnboardingFooter currentStep={3} totalSteps={4} onNext={onNext} onPrev={onPrev} onSkip={onSkip} />
         </div>
     );
 };
@@ -305,7 +261,7 @@ const FilesPage = ({ onFinish, onPrev }: { onFinish: () => void; onPrev?: () =>
                     {commands[commandIndex](handleCommandComplete)}
                 </div>
             </div>
-            <OnboardingFooter currentStep={3} totalSteps={3} onNext={onFinish} onPrev={onPrev} />
+            <OnboardingFooter currentStep={4} totalSteps={4} onNext={onFinish} onPrev={onPrev} />
         </div>
     );
 };
@@ -329,6 +285,8 @@ export const OnboardingFeatures = ({ onComplete }: { onComplete: () => void }) =
 
     const handleNext = () => {
         if (currentPage === "waveai") {
+            setCurrentPage("durable");
+        } else if (currentPage === "durable") {
             setCurrentPage("magnify");
         } else if (currentPage === "magnify") {
             setCurrentPage("files");
@@ -336,8 +294,10 @@ export const OnboardingFeatures = ({ onComplete }: { onComplete: () => void }) =
     };
 
     const handlePrev = () => {
-        if (currentPage === "magnify") {
+        if (currentPage === "durable") {
             setCurrentPage("waveai");
+        } else if (currentPage === "magnify") {
+            setCurrentPage("durable");
         } else if (currentPage === "files") {
             setCurrentPage("magnify");
         }
@@ -360,6 +320,9 @@ export const OnboardingFeatures = ({ onComplete }: { onComplete: () => void }) =
         case "waveai":
             pageComp = <WaveAIPage onNext={handleNext} onSkip={handleSkip} />;
             break;
+        case "durable":
+            pageComp = <DurableSessionPage onNext={handleNext} onSkip={handleSkip} onPrev={handlePrev} />;
+            break;
         case "magnify":
             pageComp = <MagnifyBlocksPage onNext={handleNext} onSkip={handleSkip} onPrev={handlePrev} />;
             break;
diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
index 8a30f5e9be..94466831e8 100644
--- a/frontend/types/gotypes.d.ts
+++ b/frontend/types/gotypes.d.ts
@@ -1428,7 +1428,7 @@ declare global {
         "wsh:haderror"?: boolean;
         "conn:conntype"?: string;
         "conn:wsherrorcode"?: string;
-        "onboarding:feature"?: "waveai" | "magnify" | "wsh";
+        "onboarding:feature"?: "waveai" | "durable" | "magnify" | "wsh";
         "onboarding:version"?: string;
         "onboarding:githubstar"?: "already" | "star" | "later";
         "display:height"?: number;
diff --git a/pkg/telemetry/telemetrydata/telemetrydata.go b/pkg/telemetry/telemetrydata/telemetrydata.go
index c1fc17c76c..6be7a6854e 100644
--- a/pkg/telemetry/telemetrydata/telemetrydata.go
+++ b/pkg/telemetry/telemetrydata/telemetrydata.go
@@ -122,7 +122,7 @@ type TEventProps struct {
 	ConnType         string `json:"conn:conntype,omitempty"`
 	ConnWshErrorCode string `json:"conn:wsherrorcode,omitempty"`
 
-	OnboardingFeature    string `json:"onboarding:feature,omitempty" tstype:"\"waveai\" | \"magnify\" | \"wsh\""`
+	OnboardingFeature    string `json:"onboarding:feature,omitempty" tstype:"\"waveai\" | \"durable\" | \"magnify\" | \"wsh\""`
 	OnboardingVersion    string `json:"onboarding:version,omitempty"`
 	OnboardingGithubStar string `json:"onboarding:githubstar,omitempty" tstype:"\"already\" | \"star\" | \"later\""`