oysterun 1.6.0-beta.21 → 1.6.0-beta.22

package/dev/client/web/index.html

@@ -1258,48 +1258,6 @@
         justify-content: center;
       }
 
-      .agent-store-demo-backdrop {
-        z-index: 10020;
-      }
-
-      .agent-store-demo-status {
-        min-height: 42px;
-        margin-top: 14px;
-        display: flex;
-        align-items: center;
-        gap: 10px;
-        color: var(--ink-soft);
-        font-size: 14px;
-        line-height: 1.45;
-      }
-
-      .agent-store-demo-spinner {
-        width: 16px;
-        height: 16px;
-        flex: 0 0 16px;
-        border: 2px solid rgba(151, 89, 49, 0.22);
-        border-top-color: var(--accent);
-        border-radius: 50%;
-        animation: oysterun-auth-spin 800ms linear infinite;
-      }
-
-      .browse-create-folder-modal .agent-store-demo-actions {
-        display: grid;
-        grid-template-columns: minmax(0, 1fr);
-        gap: 10px;
-      }
-
-      .agent-store-demo-actions > button {
-        min-width: 0;
-        justify-content: center;
-      }
-
-      #agent-store-demo-submit-btn {
-        display: inline-flex;
-        align-items: center;
-        gap: 9px;
-      }
-
       #app {
         display: none;
         height: 100vh;
@@ -4749,6 +4707,57 @@
         grid-template-columns: minmax(0, 1fr);
       }
 
+      /* Folder Session page: History rows with inline Resume / Duplicate Setup. */
+      .session-list-row-history.session-list-row-inline-actions {
+        grid-template-columns: minmax(0, 1fr) auto;
+        align-items: center;
+      }
+
+      .session-row-inline-actions {
+        display: flex;
+        align-items: center;
+        padding-right: 8px;
+      }
+
+      .session-row-inline-action {
+        width: var(--oysterun-session-action-trigger-target-size);
+        height: var(--oysterun-session-action-trigger-target-size);
+        display: grid;
+        place-items: center;
+        padding: 0;
+        border: 0;
+        border-radius: 50%;
+        background: transparent;
+        cursor: pointer;
+      }
+
+      .session-row-inline-action:hover:not(:disabled),
+      .session-row-inline-action:focus-visible {
+        background: var(--oysterun-session-action-hover);
+        outline: none;
+      }
+
+      .session-row-inline-action:focus-visible {
+        outline: 2px solid var(--oysterun-session-action-focus);
+        outline-offset: -2px;
+      }
+
+      .session-row-inline-action:disabled {
+        cursor: default;
+        opacity: 0.45;
+      }
+
+      .folder-sessions-intro {
+        display: grid;
+        gap: 14px;
+        padding: 16px 22px 8px;
+      }
+
+      .folder-sessions-label {
+        font-size: 13px;
+        font-weight: 600;
+      }
+
       .session-list-row-desired-open {
         grid-template-columns: minmax(0, 1fr) 58px;
       }
@@ -7796,6 +7805,15 @@
           grid-template-columns: minmax(0, 1fr);
         }
 
+        .sessions-collection-list
+          .session-list-row-history.session-list-row-inline-actions {
+          grid-template-columns: minmax(0, 1fr) auto;
+        }
+
+        .folder-sessions-intro {
+          padding: 14px 14px 6px;
+        }
+
         .web-collection-list .web-site-row {
           grid-template-columns: minmax(0, 1fr) 86px;
         }
@@ -8488,26 +8506,6 @@
                 >
               </div>
               <div class="topbar-right">
-                <button
-                  class="sessions-compose-button topbar-agent-store hidden"
-                  id="entry-agent-store-btn"
-                  type="button"
-                  aria-label="Agent Store"
-                  title="Agent Store"
-                  data-testid="oysterun-agent-store-demo"
-                  onClick=${call("openAgentStoreDemo")}
-                >
-                  <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                    <path
-                      d="M4 9.25h16v10.5H4V9.25Zm2-5h12l2 5H4l2-5Zm4 5v10.5m4-10.5v10.5"
-                      fill="none"
-                      stroke="currentColor"
-                      stroke-width="1.7"
-                      stroke-linecap="round"
-                      stroke-linejoin="round"
-                    ></path>
-                  </svg>
-                </button>
                 <button
                   class="sessions-compose-button topbar-sessions-compose hidden"
                   id="entry-start-session-btn"
@@ -9715,36 +9713,9 @@
                         </div>
                       </div>
                       <div class="kv-table">
-                        <div class="kv-label">Direct Host URL</div>
-                        <div class="kv-value">
-                          <div class="value-stack">
-                            <div class="settings-copy-url-control">
-                              <input
-                                id="host-public-base-url"
-                                type="url"
-                                placeholder="Host URL from setup"
-                                data-oysterun-p75-copyable-url-control="direct-host-url"
-                              />
-                              <button
-                                class="btn-primary btn-compact settings-copy-url-btn"
-                                id="host-public-base-url-copy-btn"
-                                type="button"
-                                onClick=${call(
-                                  "copyHostPreferencesDirectHostUrl"
-                                )}
-                              >
-                                Copy
-                              </button>
-                            </div>
-                            <div
-                              class="field-hint"
-                              id="host-public-base-url-hint"
-                            >
-                              Optional. Use this URL for manual connection.
-                            </div>
-                          </div>
+                        <div class="kv-label">
+                          Local address (this computer)
                         </div>
-                        <div class="kv-label">Local URL</div>
                         <div class="kv-value">
                           <div class="settings-copy-url-control">
                             <input
@@ -10288,13 +10259,23 @@
                               class="field-hint host-update-phase"
                               id="host-update-phase"
                             ></div>
+                            <button
+                              class="btn-ghost btn-compact hidden"
+                              type="button"
+                              id="host-update-card-diagnostics-btn"
+                              onClick=${call(
+                                "downloadHostLifecycleDiagnosticSummary"
+                              )}
+                            >
+                              Download diagnostic summary
+                            </button>
                             <button
                               class="btn-ghost btn-compact hidden"
                               type="button"
                               id="host-update-recovery-btn"
                               onClick=${call("runOysterunRecoveryAction")}
                             >
-                              Repair and restart
+                              Restore and restart
                             </button>
                             <div
                               class="field-hint host-update-recovery-status hidden"
@@ -10388,6 +10369,16 @@
                                   >
                                     Cancel
                                   </button>
+                                  <button
+                                    class="btn-ghost hidden"
+                                    type="button"
+                                    id="host-update-confirm-diagnostics-btn"
+                                    onClick=${call(
+                                      "downloadHostLifecycleDiagnosticSummary"
+                                    )}
+                                  >
+                                    Download diagnostic summary
+                                  </button>
                                   <button
                                     class="btn-primary"
                                     type="button"
@@ -11743,9 +11734,30 @@ Terminal output will appear here.</pre
                         </div>
                       </div>
                     </div>
+                  </section>
+                </div>
+              </div>
+            </section>
+          `;
+        }
+
+        // Resume Session reuses the Sessions history list primitives for one
+        // folder. Its rows and menus come from the same History renderers.
+        function FolderSessionsView() {
+          return html`
+            <section
+              id="folder-sessions-view"
+              class="view view-page-scroll"
+              data-oysterun-folder-sessions-page="true"
+            >
+              <div class="collection-layout sessions-collection-layout">
+                <div class="collection-shell sessions-collection-shell">
+                  <section
+                    class="panel collection-panel sessions-collection-panel"
+                  >
                     <div
-                      class="session-action-menu-layer hidden"
-                      id="session-action-menu-layer"
+                      class="collection-list sessions-collection-list"
+                      id="folder-sessions-list"
                     ></div>
                   </section>
                 </div>
@@ -12508,126 +12520,6 @@ Terminal output will appear here.</pre
           `;
         }
 
-        function AgentStoreDemoModal() {
-          return html`
-            <div
-              id="agent-store-demo-backdrop"
-              class="modal-backdrop sheet browse-create-folder-backdrop agent-store-demo-backdrop hidden"
-              onClick=${closeBackdrop("closeAgentStoreDemo")}
-            >
-              <div
-                class="modal sheet narrow browse-create-folder-modal agent-store-demo-modal"
-                role="dialog"
-                aria-modal="true"
-                aria-labelledby="agent-store-demo-title"
-                data-oysterun-agent-store-demo="true"
-              >
-                <button
-                  class="modal-close-btn browse-create-folder-close-btn"
-                  id="agent-store-demo-close-btn"
-                  type="button"
-                  aria-label="Close"
-                  title="Close"
-                  onClick=${call("closeAgentStoreDemo")}
-                >
-                  x
-                </button>
-                <div class="modal-scroll">
-                  <span class="eyebrow">Agent Store Demo</span>
-                  <h2 id="agent-store-demo-title">Clone GitHub Agent</h2>
-                  <div class="field" style="margin-top:14px">
-                    <label for="agent-store-demo-repository-select"
-                      >Demo Repository</label
-                    >
-                    <select
-                      id="agent-store-demo-repository-select"
-                      onChange=${(event) =>
-                        window.handleAgentStoreDemoRepositorySelect?.(event)}
-                    >
-                      <option value="">Choose a demo repository</option>
-                      <option
-                        value="https://github.com/GoatWang/oysterun-ccstock-workenv"
-                      >
-                        CCStock WorkEnv
-                      </option>
-                      <option
-                        value="https://github.com/GoatWang/oysterun-ccstock-workenv-en"
-                      >
-                        CCStock WorkEnv (English)
-                      </option>
-                      <option
-                        value="https://github.com/GoatWang/oysterun-github-tracker"
-                      >
-                        GitHub Tracker
-                      </option>
-                    </select>
-                  </div>
-                  <div class="field" style="margin-top:14px">
-                    <label for="agent-store-demo-url-input"
-                      >GitHub Repository URL</label
-                    >
-                    <input
-                      id="agent-store-demo-url-input"
-                      type="url"
-                      inputmode="url"
-                      autocomplete="url"
-                      autocapitalize="none"
-                      spellcheck="false"
-                      placeholder="https://github.com/owner/repository"
-                      onInput=${(event) =>
-                        window.handleAgentStoreDemoUrlInput?.(event)}
-                      onKeyDown=${(event) =>
-                        window.handleAgentStoreDemoUrlKeyDown?.(event)}
-                    />
-                  </div>
-                  <div
-                    id="agent-store-demo-status"
-                    class="agent-store-demo-status hidden"
-                    role="status"
-                    aria-live="polite"
-                    aria-atomic="true"
-                  >
-                    <span
-                      id="agent-store-demo-status-spinner"
-                      class="agent-store-demo-spinner"
-                      aria-hidden="true"
-                    ></span>
-                    <span id="agent-store-demo-status-text"></span>
-                  </div>
-                  <div
-                    id="agent-store-demo-error"
-                    class="error-box hidden"
-                    style="margin-top:12px"
-                  ></div>
-                </div>
-                <div class="modal-actions agent-store-demo-actions">
-                  <button
-                    class="btn-primary"
-                    id="agent-store-demo-submit-btn"
-                    type="button"
-                    onClick=${call("submitAgentStoreDemo")}
-                  >
-                    <span
-                      id="agent-store-demo-submit-spinner"
-                      class="agent-store-demo-spinner hidden"
-                      aria-hidden="true"
-                    ></span>
-                    <span id="agent-store-demo-submit-label">OK</span>
-                  </button>
-                  <button
-                    class="btn-secondary hidden"
-                    id="agent-store-demo-session-setup-btn"
-                    type="button"
-                    onClick=${call("openAgentStoreDemoSessionSetup")}
-                  >
-                    Open Session Setup
-                  </button>
-                </div>
-              </div>
-            </div>
-          `;
-        }
-
         function ProviderAuthModal() {
           return html`
             <div
@@ -12811,6 +12703,7 @@ Waiting for Claude login output…</pre
 	              <div class="app-body">
 	                  <main class="workspace" id="dashboard-workspace">
 		                    <${EntryView} />
+                        <${FolderSessionsView} />
                         <${WebView} />
                         <${MailView} />
                         <${SchedulerView} />
@@ -12826,6 +12719,10 @@ Waiting for Claude login output…</pre
                       <${BrowserSurfaceView} />
 		                    <${AgentProfileView} />
 	                    <${ExplorerView} />
+                        <div
+                          class="session-action-menu-layer hidden"
+                          id="session-action-menu-layer"
+                        ></div>
 	                  </main>
                 </div>
                 <nav class="bottom-nav" id="bottom-nav">
@@ -12981,7 +12878,6 @@ Waiting for Claude login output…</pre
             <div id="browse-context-menu" class="browse-context-menu hidden" role="menu" aria-hidden="true" tabindex="-1"></div>
             <div id="app-toast" class="app-toast oysterun-notice hidden" role="status" aria-live="polite" aria-atomic="true"></div>
             <${BrowseCreateFolderModal} />
-            <${AgentStoreDemoModal} />
             <${ProviderAuthModal} />
             <${ChatImagePreviewModal} />
             <${HiddenCache} />
@@ -14454,7 +14350,6 @@ Waiting for Claude login output…</pre
       const OYSTERUN_PROVIDER_SKILL_MODULE_HELPERS = Object.freeze([
         ["oysterun_sessions_skill", "oysterun-sessions"],
         ["oysterun_session_chat_skill", "oysterun-session-chat"],
-        ["oysterun_find_context_skill", "oysterun-find-context"],
         ["oysterun_scheduler_skill", "oysterun-scheduler"],
         ["oysterun_mail_skill", "oysterun-mail"],
         ["oysterun_notification_skill", "oysterun-notifications"],
@@ -14689,6 +14584,7 @@ Waiting for Claude login output…</pre
           for (const field of [
             "restore_failed_reason",
             "manual_start_setup_reason",
+            "agent_folder_real_path",
           ]) {
             if (field in row) nullableString(row[field], field);
           }
@@ -14735,6 +14631,16 @@ Waiting for Claude login output…</pre
               "Session History cannot claim active provider lifecycle."
             );
           }
+          if (
+            row.telegram_listener_alert != null &&
+            (typeof row.telegram_listener_alert !== "object" ||
+              typeof row.telegram_listener_alert.outage_id !== "string" ||
+              row.kind !== "running")
+          ) {
+            throw new Error(
+              "Session data Telegram listener reminder must belong to a live Session."
+            );
+          }
           if (
             "restore_failed" in row &&
             typeof row.restore_failed !== "boolean"
@@ -16673,17 +16579,6 @@ Waiting for Claude login output…</pre
         };
       }
 
-      function createAgentStoreDemoState() {
-        return {
-          visible: false,
-          phase: "idle",
-          repositoryUrl: "",
-          status: "",
-          error: "",
-          clone: null,
-          requestId: 0,
-        };
-      }
       function createTerminalViewState() {
         return {
           terminal: null,
@@ -16750,18 +16645,6 @@ Waiting for Claude login output…</pre
             payload.display_name = String(value || "").trim() || null;
           },
         }),
-        hostPreferenceField("publicBaseUrl", "", {
-          controlIds: ["host-public-base-url"],
-          read: hostPreferenceTextControl(
-            "host-public-base-url",
-            "publicBaseUrl"
-          ),
-          serialize: (value, { payload }) => {
-            const normalized = String(value || "").trim() || null;
-            payload.direct_host_url = normalized;
-            payload.public_base_url = normalized;
-          },
-        }),
         hostPreferenceField("defaultBrowsePath", "", {
           controlIds: ["host-default-browse-path"],
           read: hostPreferenceTextControl(
@@ -16993,9 +16876,6 @@ Waiting for Claude login output…</pre
           loaded: false,
           loading: false,
           saving: false,
-          // Internal cloud/mamarun plumbing is retained but not product-facing
-          // in the short term; Host Preferences intentionally hides this.
-          connectionMode: "direct",
           displayName: "",
           notificationSoundWebEnabled: true,
           notificationSoundAppEnabled: true,
@@ -17045,8 +16925,6 @@ Waiting for Claude login output…</pre
           allowedPathDisabled: true,
           allowedPathDebugUiEnabled: false,
           providerPermissionDebugModeDropdownEnabled: false,
-          publicBaseUrl: "",
-          activeDirectHostUrl: "",
           managedTunnelEnabled: false,
           managedTunnelStatus: "disabled",
           managedTunnelStatusReason: "managed_tunnel_disabled",
@@ -17060,7 +16938,6 @@ Waiting for Claude login output…</pre
           notificationDiagnosticsUiEnabled: false,
           notificationServiceWorkerState: "unknown",
           notificationLastError: "",
-          directHostUrlRestartRequired: false,
           hostRestartSupported: false,
           loginQr: null,
           loginQrLoading: false,
@@ -17148,7 +17025,6 @@ Waiting for Claude login output…</pre
         },
       };
       let providerAuthModalState = createProviderAuthModalState();
-      let agentStoreDemoState = createAgentStoreDemoState();
       let chatImagePreviewState = {
         visible: false,
         requestKey: "",
@@ -17624,16 +17500,6 @@ Waiting for Claude login output…</pre
           typeof fallbackValue === "string" ? fallbackValue.trim() : "";
         return fallback || defaultValue;
       }
-      function requiresProviderPermissionPolicyConfirmation(providerId, value) {
-        const selected = typeof value === "string" ? value.trim() : "";
-        const defaultValue = getDefaultProviderPermissionPolicy(providerId);
-        return (
-          isProviderPermissionDebugModeDropdownEnabled() &&
-          Boolean(selected) &&
-          Boolean(defaultValue) &&
-          selected !== defaultValue
-        );
-      }
       function syncSessionSetupInterfaceStyleVisibility() {
         const visible = isSessionSetupInterfaceStyleVisible();
         for (const element of document.querySelectorAll(
@@ -22374,6 +22240,7 @@ Waiting for Claude login output…</pre
               syncOwnerId = null,
               timeoutMs = void 0,
               onUploadProgress = null,
+              onDispatch = null,
             } = {}
           ) {
             if (this.closed)
@@ -22390,6 +22257,7 @@ Waiting for Claude login output…</pre
             const isMatrixSync = MATRIX_SYNC_PATH.test(request.path);
             const startedAt = Date.now();
             const releaseTransport = this.acquireTransportLease(transport);
+            onDispatch?.({ pathKind });
             this.emitDiagnostic({
               event_type: isMatrixSync
                 ? "matrix_sync_request_started"
@@ -24715,6 +24583,17 @@ Waiting for Claude login output…</pre
             headers: response.headers || {},
           });
         }
+        function responseFromDispatchedLogicalResult(
+          result,
+          dispatchedPathKind
+        ) {
+          return dispatchedPathKind === "webrtc"
+            ? responseFromLogicalResult(result)
+            : responseFromBootstrapLogicalResult(result);
+        }
+        function transportAccountingKind(pathKind) {
+          return pathKind === "webrtc" ? "datachannel" : "bootstrap";
+        }
         function logicalResultBodyByteLength(result) {
           if (result?.response?.body instanceof Uint8Array) {
             return result.response.body.byteLength;
@@ -26415,7 +26294,7 @@ Waiting for Claude login output…</pre
                     }
                   : {}),
               };
-              recordTransportRequest(this.accounting, "bootstrap", path);
+              let dispatchedPathKind2 = "bootstrap";
               let result2;
               try {
                 result2 = await this.logicalConnection.request(
@@ -26425,6 +26304,14 @@ Waiting for Claude login output…</pre
                     syncOwnerId: MATRIX_SYNC_PATH2.test(path)
                       ? this.ensureSyncOwner()
                       : null,
+                    onDispatch: ({ pathKind }) => {
+                      dispatchedPathKind2 = pathKind;
+                      recordTransportRequest(
+                        this.accounting,
+                        transportAccountingKind(pathKind),
+                        path
+                      );
+                    },
                   }
                 );
               } catch (error) {
@@ -26465,10 +26352,13 @@ Waiting for Claude login output…</pre
                 }
                 throw error;
               }
-              const response = responseFromBootstrapLogicalResult(result2);
+              const response = responseFromDispatchedLogicalResult(
+                result2,
+                dispatchedPathKind2
+              );
               recordTransportResponseBytes(
                 this.accounting,
-                "bootstrap",
+                transportAccountingKind(dispatchedPathKind2),
                 logicalResultBodyByteLength(result2),
                 path
               );
@@ -26492,6 +26382,7 @@ Waiting for Claude login output…</pre
               signal: request.signal,
               ...(body ? { body } : {}),
             };
+            let dispatchedPathKind = "webrtc";
             const result = await this.logicalConnection.request(
               requestPayload,
               {
@@ -26505,16 +26396,23 @@ Waiting for Claude login output…</pre
                   ? BULK_REQUEST_TIMEOUT_MS
                   : void 0,
                 onUploadProgress: recovery.onUploadProgress || null,
+                onDispatch: ({ pathKind }) => {
+                  dispatchedPathKind = pathKind;
+                },
               }
             );
-            recordTransportRequest(this.accounting, "datachannel", path);
+            const accountingKind = transportAccountingKind(dispatchedPathKind);
+            recordTransportRequest(this.accounting, accountingKind, path);
             recordTransportResponseBytes(
               this.accounting,
-              "datachannel",
+              accountingKind,
               logicalResultBodyByteLength(result),
               path
             );
-            return responseFromLogicalResult(result);
+            return responseFromDispatchedLogicalResult(
+              result,
+              dispatchedPathKind
+            );
           }
           status() {
             const logicalStatus = this.logicalConnection.status();
@@ -26770,7 +26668,7 @@ Waiting for Claude login output…</pre
             ["closed", "disconnected", "recovering", "unavailable"].includes(
               status.connection_state
             );
-          let qualifier = "Direct Host";
+          let qualifier = "Local address";
           if (originKind === "managed_endpoint") {
             qualifier =
               activePathKind === "webrtc"
@@ -27682,376 +27580,6 @@ Waiting for Claude login output…</pre
       window.openExplorerFromSessionsEmptyState =
         openExplorerFromSessionsEmptyState;
 
-      const AGENT_STORE_DEMO_PENDING_PHASES = new Set([
-        "validating",
-        "cloning",
-        "loading_config",
-        "starting_session",
-      ]);
-
-      const AGENT_STORE_DEMO_REPOSITORY_URLS = new Set([
-        "https://github.com/GoatWang/oysterun-ccstock-workenv",
-        "https://github.com/GoatWang/oysterun-ccstock-workenv-en",
-        "https://github.com/GoatWang/oysterun-github-tracker",
-      ]);
-
-      function isAgentStoreDemoPending() {
-        return AGENT_STORE_DEMO_PENDING_PHASES.has(agentStoreDemoState.phase);
-      }
-
-      function getAgentStoreDemoPendingLabel() {
-        if (agentStoreDemoState.phase === "validating") return "Validating...";
-        if (agentStoreDemoState.phase === "cloning") return "Cloning...";
-        if (agentStoreDemoState.phase === "loading_config")
-          return "Loading config...";
-        if (agentStoreDemoState.phase === "starting_session")
-          return "Starting session...";
-        return "OK";
-      }
-
-      function renderAgentStoreDemo() {
-        const backdrop = $("agent-store-demo-backdrop");
-        if (!backdrop) return;
-        const pending = isAgentStoreDemoPending();
-        const cloneComplete = Boolean(agentStoreDemoState.clone?.agent_folder);
-        const input = $("agent-store-demo-url-input");
-        const repositorySelect = $("agent-store-demo-repository-select");
-        const closeButton = $("agent-store-demo-close-btn");
-        const submitButton = $("agent-store-demo-submit-btn");
-        const submitLabel = $("agent-store-demo-submit-label");
-
-        backdrop.classList.toggle(
-          "hidden",
-          agentStoreDemoState.visible !== true
-        );
-        backdrop.dataset.phase = agentStoreDemoState.phase;
-        if (input) {
-          if (input.value !== agentStoreDemoState.repositoryUrl) {
-            input.value = agentStoreDemoState.repositoryUrl;
-          }
-          input.disabled = pending || cloneComplete;
-        }
-        if (repositorySelect) {
-          repositorySelect.value = AGENT_STORE_DEMO_REPOSITORY_URLS.has(
-            agentStoreDemoState.repositoryUrl
-          )
-            ? agentStoreDemoState.repositoryUrl
-            : "";
-          repositorySelect.disabled = pending || cloneComplete;
-        }
-        if (closeButton) closeButton.disabled = pending;
-        if (submitButton) {
-          submitButton.disabled =
-            pending ||
-            cloneComplete ||
-            !agentStoreDemoState.repositoryUrl.trim();
-          submitButton.classList.toggle(
-            "hidden",
-            agentStoreDemoState.phase === "failed_after_clone"
-          );
-        }
-        if (submitLabel)
-          submitLabel.textContent = getAgentStoreDemoPendingLabel();
-        setVisible("agent-store-demo-submit-spinner", pending);
-        setVisible("agent-store-demo-status", pending);
-        setText(
-          "agent-store-demo-status-text",
-          agentStoreDemoState.status || ""
-        );
-        showError("agent-store-demo-error", agentStoreDemoState.error || "");
-        setVisible(
-          "agent-store-demo-session-setup-btn",
-          agentStoreDemoState.phase === "failed_after_clone" && cloneComplete
-        );
-      }
-
-      function openAgentStoreDemo() {
-        if (isAgentStoreDemoPending()) return;
-        agentStoreDemoState = {
-          ...createAgentStoreDemoState(),
-          visible: true,
-          requestId: agentStoreDemoState.requestId + 1,
-        };
-        renderAgentStoreDemo();
-        requestAnimationFrame(() => {
-          $("agent-store-demo-url-input")?.focus({ preventScroll: true });
-        });
-      }
-
-      function closeAgentStoreDemo(opts = {}) {
-        if (isAgentStoreDemoPending() && opts.force !== true) return;
-        agentStoreDemoState = {
-          ...createAgentStoreDemoState(),
-          requestId: agentStoreDemoState.requestId + 1,
-        };
-        renderAgentStoreDemo();
-      }
-
-      function handleAgentStoreDemoUrlInput(event) {
-        if (isAgentStoreDemoPending() || agentStoreDemoState.clone) return;
-        agentStoreDemoState = {
-          ...agentStoreDemoState,
-          phase: "idle",
-          repositoryUrl: event?.target?.value || "",
-          status: "",
-          error: "",
-        };
-        renderAgentStoreDemo();
-      }
-
-      function handleAgentStoreDemoRepositorySelect(event) {
-        if (isAgentStoreDemoPending() || agentStoreDemoState.clone) return;
-        const repositoryUrl = String(event?.target?.value || "").trim();
-        if (!repositoryUrl) return;
-        agentStoreDemoState = {
-          ...agentStoreDemoState,
-          phase: "idle",
-          repositoryUrl,
-          status: "",
-          error: "",
-        };
-        renderAgentStoreDemo();
-        requestAnimationFrame(() => {
-          $("agent-store-demo-url-input")?.focus({ preventScroll: true });
-        });
-      }
-
-      function handleAgentStoreDemoUrlKeyDown(event) {
-        if (event?.key !== "Enter" || event.isComposing) return;
-        event.preventDefault();
-        if (!isAgentStoreDemoPending()) void submitAgentStoreDemo();
-      }
-
-      function validateAgentStoreDemoUrl(value) {
-        let parsed;
-        try {
-          parsed = new URL(String(value || "").trim());
-        } catch {
-          throw new Error("Enter a valid public GitHub HTTPS repository URL.");
-        }
-        if (
-          parsed.protocol !== "https:" ||
-          parsed.hostname.toLowerCase() !== "github.com" ||
-          parsed.username ||
-          parsed.password ||
-          parsed.port ||
-          parsed.search ||
-          parsed.hash ||
-          !/^\/[^/]+\/[^/]+\/?$/.test(parsed.pathname)
-        ) {
-          throw new Error(
-            "Only public https://github.com/<owner>/<repo> URLs are supported."
-          );
-        }
-        return parsed.toString();
-      }
-
-      async function getAgentStoreDemoProviderSkillInstallDecision({
-        agentId,
-        agentFolder,
-        provider,
-      }) {
-        const params = new URLSearchParams({
-          agent_id: agentId,
-          agent_folder: agentFolder,
-          provider,
-        });
-        try {
-          const status = await apiWithAuthRetry(
-            "GET",
-            `/agent/provider-skill-status?${params.toString()}`
-          );
-          return (
-            status?.default_checked === true &&
-            status?.can_install === true &&
-            status?.disabled !== true
-          );
-        } catch {
-          return false;
-        }
-      }
-
-      function buildAgentStoreDemoSessionStartPayload({
-        clone,
-        folderConfig,
-        installOysterunSkills,
-      }) {
-        const provider = String(folderConfig?.provider || "").trim();
-        const model = String(folderConfig?.model || "").trim();
-        if (!provider || !model) {
-          throw new Error(
-            "The cloned folder did not resolve a provider and model."
-          );
-        }
-        const payload = {
-          agent_id: clone.agent_id,
-          agent_folder: clone.agent_folder,
-          provider,
-          model,
-          interface_type: normalizeFirstPartyInterfaceType(
-            folderConfig.interfaceType || "coding"
-          ),
-          reasoning_effort: folderConfig.reasoningEffort || undefined,
-          dangerous_mode: folderConfig.dangerousMode === true,
-          allow_dangerously_skip_permissions:
-            folderConfig.allowDangerouslySkipPermissions === true,
-          install_oysterun_skills: installOysterunSkills === true,
-        };
-        if (provider === "claude") {
-          payload.permission_mode = folderConfig.permissionMode;
-        } else if (provider === "codex") {
-          payload.approval_policy = folderConfig.approvalPolicy;
-        }
-        const proof = {
-          ...buildCreateSessionSetupProviderModelPermissionProof(payload),
-          proof_surface: "visible_agent_store_clone_modal_state",
-        };
-        payload.session_setup_provider_model_permission_proof = proof;
-        return { payload, proof };
-      }
-
-      function finalizeAgentStoreDemoStartedSession(data, expectedProof) {
-        const proofValidation =
-          validateSessionSetupProviderModelPermissionProofResponse(
-            data,
-            expectedProof,
-            { requireCountableStartResponseProof: true }
-          );
-        if (!proofValidation.ok) {
-          throw new Error(
-            `Session Setup proof validation failed: ${proofValidation.errors.join(
-              " "
-            )}`
-          );
-        }
-        const normalizedData = {
-          ...data,
-          session_setup_provider_model_permission_proof: proofValidation.proof,
-        };
-        clearPendingAttachments();
-        primeSelectedAgentFromStart(normalizedData);
-        const startedLiveSession =
-          upsertStartedSessionIntoLiveCatalog(normalizedData);
-        invalidateDashboardDataCaches({
-          catalog: true,
-          sessions: true,
-          history: true,
-          transcripts: true,
-        });
-        if (
-          !startedLiveSession ||
-          startedLiveSession.sessionId !== normalizedData.session_id
-        ) {
-          throw new Error(
-            "Agent Store could not materialize the started Host session before opening chat."
-          );
-        }
-        return normalizedData.session_id;
-      }
-
-      async function submitAgentStoreDemo() {
-        if (isAgentStoreDemoPending() || agentStoreDemoState.clone) return;
-        const requestId = agentStoreDemoState.requestId + 1;
-        agentStoreDemoState = {
-          ...agentStoreDemoState,
-          phase: "validating",
-          status: "Validating GitHub repository...",
-          error: "",
-          requestId,
-        };
-        renderAgentStoreDemo();
-
-        try {
-          const repositoryUrl = validateAgentStoreDemoUrl(
-            agentStoreDemoState.repositoryUrl
-          );
-          agentStoreDemoState = {
-            ...agentStoreDemoState,
-            phase: "cloning",
-            status: "Cloning the repository into Default Browse Root...",
-          };
-          renderAgentStoreDemo();
-          const clone = await apiWithAuthRetry(
-            "POST",
-            "/agent-store/demo/clone",
-            { repository_url: repositoryUrl }
-          );
-          if (agentStoreDemoState.requestId !== requestId) return;
-
-          agentStoreDemoState = {
-            ...agentStoreDemoState,
-            phase: "loading_config",
-            status: "Loading the cloned agent configuration...",
-            clone,
-          };
-          renderAgentStoreDemo();
-          const folderConfig = await apiWithAuthRetry(
-            "GET",
-            `/dev/folder-config?path=${encodeURIComponent(clone.agent_folder)}`
-          );
-          if (agentStoreDemoState.requestId !== requestId) return;
-          const installOysterunSkills =
-            await getAgentStoreDemoProviderSkillInstallDecision({
-              agentId: clone.agent_id,
-              agentFolder: clone.agent_folder,
-              provider: folderConfig.provider,
-            });
-          const { payload, proof } = buildAgentStoreDemoSessionStartPayload({
-            clone,
-            folderConfig,
-            installOysterunSkills,
-          });
-
-          agentStoreDemoState = {
-            ...agentStoreDemoState,
-            phase: "starting_session",
-            status: "Starting a session with the resolved agent settings...",
-          };
-          renderAgentStoreDemo();
-          const data = await apiWithAuthRetry(
-            "POST",
-            "/session/start",
-            payload
-          );
-          if (agentStoreDemoState.requestId !== requestId) return;
-          const sessionId = finalizeAgentStoreDemoStartedSession(data, proof);
-          closeAgentStoreDemo({ force: true });
-          openRouteCForStartedSession(sessionId);
-        } catch (err) {
-          if (agentStoreDemoState.requestId !== requestId) return;
-          const cloneComplete = Boolean(
-            agentStoreDemoState.clone?.agent_folder
-          );
-          const detail = String(err?.data?.detail || "").trim();
-          const message = cloneComplete
-            ? formatCreateStepError("Could not start session", err)
-            : err?.message || "Could not clone the GitHub repository.";
-          agentStoreDemoState = {
-            ...agentStoreDemoState,
-            phase: cloneComplete ? "failed_after_clone" : "failed_before_clone",
-            status: "",
-            error: detail ? `${message}\n${detail}` : message,
-          };
-          renderAgentStoreDemo();
-        }
-      }
-
-      function openAgentStoreDemoSessionSetup() {
-        const folder = agentStoreDemoState.clone?.agent_folder || "";
-        if (!folder || isAgentStoreDemoPending()) return;
-        closeAgentStoreDemo({ force: true });
-        openCreateModal(folder);
-      }
-
-      window.openAgentStoreDemo = openAgentStoreDemo;
-      window.closeAgentStoreDemo = closeAgentStoreDemo;
-      window.handleAgentStoreDemoUrlInput = handleAgentStoreDemoUrlInput;
-      window.handleAgentStoreDemoRepositorySelect =
-        handleAgentStoreDemoRepositorySelect;
-      window.handleAgentStoreDemoUrlKeyDown = handleAgentStoreDemoUrlKeyDown;
-      window.submitAgentStoreDemo = submitAgentStoreDemo;
-      window.openAgentStoreDemoSessionSetup = openAgentStoreDemoSessionSetup;
-
       function getHostDefaultRuntime() {
         return (
           hostPreferencesState.effectiveDefaultProvider ||
@@ -30099,10 +29627,6 @@ Waiting for Claude login output…</pre
         );
       }
 
-      function getConnectionModeLabel(mode) {
-        return mode === "cloud" ? "Cloud" : "Direct";
-      }
-
       function getCreateDefaultInterfaceType() {
         return normalizeFirstPartyInterfaceType(
           hostPreferencesState.interfaceType ||
@@ -31044,6 +30568,36 @@ Waiting for Claude login output…</pre
         });
       }
 
+      function buildFolderSessionsRoute({ folder = "", returnPath = "" } = {}) {
+        return normalizeClientRoute({
+          screen: "folder-sessions",
+          folder,
+          returnPath,
+        });
+      }
+
+      // Resume Session returns only to the standalone Explorer location that
+      // opened it, like File Preview and the folder picker's return_path.
+      function normalizeFolderSessionsReturnPath(value) {
+        const rawPath = sanitizeRouteText(value);
+        if (!rawPath) return "";
+        let resolvedPath;
+        try {
+          resolvedPath = new URL(rawPath, BASE);
+        } catch {
+          return "";
+        }
+        if (resolvedPath.origin !== BASE) return "";
+        const pathname = resolvedPath.pathname.replace(/\/+$/, "") || "/";
+        if (pathname !== "/app/explorer") return "";
+        return `${pathname}${resolvedPath.search}`;
+      }
+
+      function getFolderSessionsReturnTarget(route = getCurrentRoute()) {
+        // Same fallback as File Preview: the standalone Explorer.
+        return normalizeClientRoute(route).returnPath || "/app/explorer";
+      }
+
       function buildSettingsRoute() {
         return normalizeClientRoute({ screen: "host-preferences" });
       }
@@ -31319,6 +30873,22 @@ Waiting for Claude login output…</pre
             warning,
           };
         }
+        if (screen === "folder-sessions") {
+          const folder = sanitizeRouteText(route?.folder);
+          if (!folder) {
+            return buildSessionsRoute({
+              warning:
+                warning ||
+                "Requested Resume Session page is missing a folder. Opening Sessions.",
+            });
+          }
+          return {
+            screen: "folder-sessions",
+            folder,
+            returnPath: normalizeFolderSessionsReturnPath(route?.returnPath),
+            warning,
+          };
+        }
         if (screen === "host-preferences") {
           return { screen: "host-preferences", warning };
         }
@@ -31554,6 +31124,12 @@ Waiting for Claude login output…</pre
               url.searchParams.get("mode") === "branch" ? "branch" : "",
           });
         }
+        if (pathname === "/app/folder-sessions") {
+          return buildFolderSessionsRoute({
+            folder: url.searchParams.get("folder") || "",
+            returnPath: url.searchParams.get("return_path") || "",
+          });
+        }
         if (pathname === "/app/settings") {
           return buildSettingsRoute();
         }
@@ -31687,6 +31263,12 @@ Waiting for Claude login output…</pre
               }
             }
           }
+        } else if (normalized.screen === "folder-sessions") {
+          url.pathname = "/app/folder-sessions";
+          url.searchParams.set("folder", normalized.folder);
+          if (normalized.returnPath) {
+            url.searchParams.set("return_path", normalized.returnPath);
+          }
         } else if (normalized.screen === "host-preferences") {
           url.pathname = "/app/settings";
         } else if (normalized.screen === "voice-input-usage") {
@@ -31978,6 +31560,11 @@ Waiting for Claude login output…</pre
         } else if (normalized.screen === "voice-input-usage") {
           renderHostVoiceInputUsageDetail();
           await loadHostVoiceInputUsage();
+        } else if (normalized.screen === "folder-sessions") {
+          // Each page opening re-reads Resume eligibility, like a menu opening.
+          folderSessionsResumeStates = new Map();
+          renderFolderSessionsView();
+          void hydrateSessionListPreviews();
         } else if (normalized.screen === "change-password") {
           renderChangePasswordView();
         } else if (normalized.screen === "terminal") {
@@ -35307,9 +34894,34 @@ Waiting for Claude login output…</pre
           const rollbackText = operation.rollback_result?.safe_message || "";
           const recoveryText = operation.recovery_result?.safe_message || "";
           const cleanupText = operation.cleanup_result?.safe_message || "";
-          return `Failed check: ${rootFailure.check} (stage: ${
-            rootFailure.stage || "lifecycle"
-          }). ${rootFailure.safe_message} ${restartText}${
+          // A repeated recovery attempt reports its own (latest) failure first;
+          // the first failure stays visible as the root cause.
+          const latestFailure = operation.latest_failure;
+          const latestIsLater =
+            latestFailure?.check &&
+            latestFailure?.safe_message &&
+            Date.parse(latestFailure.observed_at || "") >
+              Date.parse(rootFailure.observed_at || "");
+          const failureText = latestIsLater
+            ? `Latest attempt failed${(() => {
+                const at = new Date(latestFailure.observed_at);
+                return Number.isNaN(at.getTime())
+                  ? ""
+                  : ` at ${at.toLocaleTimeString([], {
+                      hour: "numeric",
+                      minute: "2-digit",
+                    })}`;
+              })()}: ${latestFailure.check} (stage: ${
+                latestFailure.stage || "lifecycle"
+              }). ${String(latestFailure.safe_message)
+                .trim()
+                .replace(/([^.!?])$/, "$1.")} First failure: ${
+                rootFailure.check
+              } (stage: ${rootFailure.stage || "lifecycle"}).`
+            : `Failed check: ${rootFailure.check} (stage: ${
+                rootFailure.stage || "lifecycle"
+              }). ${rootFailure.safe_message}`;
+          return `${failureText} ${restartText}${
             rollbackText ? ` ${rollbackText}` : ""
           }${recoveryText ? ` ${recoveryText}` : ""}${
             cleanupText ? ` ${cleanupText}` : ""
@@ -36767,28 +36379,6 @@ Waiting for Claude login output…</pre
         }
       }
 
-      async function copyHostPreferencesDirectHostUrl() {
-        const value = String(
-          $("host-public-base-url")?.value ||
-            hostPreferencesState.publicBaseUrl ||
-            ""
-        ).trim();
-        if (!value) {
-          showToast("Direct Host URL is unavailable.", true, 3200);
-          return;
-        }
-        try {
-          await writeTextToClipboard(value);
-          showToast("Copied Direct Host URL");
-        } catch (err) {
-          showToast(
-            err.message || "Could not copy Direct Host URL.",
-            true,
-            4200
-          );
-        }
-      }
-
       async function copyHostPreferencesManagedEndpoint() {
         const value = String(
           $("host-managed-endpoint")?.value ||
@@ -40803,6 +40393,12 @@ Waiting for Claude login output…</pre
             subtitle: "",
           };
         }
+        if (screen === "folder-sessions") {
+          return {
+            title: getPathLastComponent(normalized.folder) || normalized.folder,
+            subtitle: "",
+          };
+        }
         if (screen === "change-password") {
           return {
             title: "Change Password",
@@ -40896,7 +40492,6 @@ Waiting for Claude login output…</pre
         setVisible("browser-site-next-btn", isBrowser);
         setVisible("browser-site-share-btn", isBrowser);
         setVisible("browser-site-exit-btn", isBrowser);
-        setVisible("entry-agent-store-btn", screen === "sessions");
         setVisible("entry-start-session-btn", screen === "sessions");
         setVisible("topbar-scheduler-new-btn", isSchedulerList);
         setVisible("topbar-scheduler-refresh-btn", isSchedulerList);
@@ -41148,7 +40743,12 @@ Waiting for Claude login output…</pre
 
       function applyNavigationState() {
         const screen = getCurrentScreen();
-        const collectionSurface = ["sessions", "web", "mail"].includes(screen)
+        const collectionSurface = [
+          "sessions",
+          "folder-sessions",
+          "web",
+          "mail",
+        ].includes(screen)
           ? screen
           : "";
         recordHostTelemetryFeatureView(getCurrentRoute());
@@ -41156,6 +40756,10 @@ Waiting for Claude login output…</pre
         closeSessionLoopActionMenu();
         closeHostSchedulerActionMenu();
         $("entry-view").classList.toggle("active", screen === "sessions");
+        $("folder-sessions-view").classList.toggle(
+          "active",
+          screen === "folder-sessions"
+        );
         $("web-view").classList.toggle("active", screen === "web");
         $("mail-view").classList.toggle("active", screen === "mail");
         $("dashboard-workspace")?.classList.toggle(
@@ -41207,6 +40811,14 @@ Waiting for Claude login output…</pre
           screen === "tool-detail"
         );
         $("browser-view").classList.toggle("active", screen === "browser");
+        // The shared row menu layer is outside every page; close it when its
+        // row is no longer on the visible page.
+        if (
+          sessionActionMenuState &&
+          !sessionActionMenuState.anchorButton?.closest?.(".view.active")
+        ) {
+          closeSessionActionMenu();
+        }
         if (screen === "explorer") {
           renderExplorerContextChrome();
         }
@@ -41395,6 +41007,14 @@ Waiting for Claude login output…</pre
 
       function handleTopbarBack() {
         const currentBackRoute = getCurrentRoute();
+        if (currentBackRoute.screen === "folder-sessions") {
+          // Explorer is a separate document; return to the exact page that
+          // opened Resume Session, as the folder picker does.
+          window.location.assign(
+            getFolderSessionsReturnTarget(currentBackRoute)
+          );
+          return;
+        }
         if (navigatePreviousPageRouteMapFallback(currentBackRoute)) {
           return;
         }
@@ -41437,7 +41057,6 @@ Waiting for Claude login output…</pre
         "browse-context-menu",
         "picker-modal-backdrop",
         "browse-create-folder-backdrop",
-        "agent-store-demo-backdrop",
         "provider-auth-backdrop",
         "chat-image-preview-backdrop",
         "command-palette",
@@ -42079,7 +41698,7 @@ Waiting for Claude login output…</pre
           $("model-hint").textContent =
             "Spillover Fake deterministic count model for P82 verification.";
           $("runtime-hint").textContent =
-            "Uses the hidden P82 Spillover Fake provider. It is available only when Host config.debug.json enables large tool spillover verification.";
+            "Uses the hidden P82 Spillover Fake provider. It is available only when Host config/debug.json enables large tool spillover verification.";
         } else if (createRuntime === "debug-p135-codex-replay") {
           modelSelect.disabled = modelSelection.options.length === 0;
           if (claudeReasoningEffortSelect) {
@@ -42091,7 +41710,7 @@ Waiting for Claude login output…</pre
           $("model-hint").textContent =
             "P135 Codex Replay deterministic fixture model.";
           $("runtime-hint").textContent =
-            "Uses the hidden P135 Codex Replay provider. It is available only when Host config.debug.json enables replay verification.";
+            "Uses the hidden P135 Codex Replay provider. It is available only when Host config/debug.json enables replay verification.";
         }
 
         if (opts.applyDefaults !== false) {
@@ -42183,6 +41802,8 @@ Waiting for Claude login output…</pre
         showError("login-error", "");
         showLoginNotice("Opening Oysterun...");
         setLoginBusy(true, "Opening…");
+        // Fixed internal account name, never a user input: a P296 Host ignores
+        // it, while an older Host (e.g. after a rolled-back update) requires it.
         const username = "admin";
         const password = $("login-pass").value;
         try {
@@ -43397,6 +43018,7 @@ Waiting for Claude login output…</pre
               session_tags_error: entry.session_tags_error ?? null,
               session_tag_labels_error: entry.session_tag_labels_error ?? null,
               agent_folder: entry.agent_folder,
+              agent_folder_real_path: entry.agent_folder_real_path,
               runtime: entry.runtime,
               model: entry.model,
               created_at: entry.started_at,
@@ -43646,6 +43268,15 @@ Waiting for Claude login output…</pre
         return menuItems.find((item) => item.disabled !== true)?.action || "";
       }
 
+      // Sessions and Resume Session can both hold a History row for the same
+      // Session; prefer the copy in the visible page.
+      function querySessionRowElement(selector) {
+        return (
+          document.querySelector(`.view.active ${selector}`) ||
+          document.querySelector(selector)
+        );
+      }
+
       function closeSessionActionMenu(opts = {}) {
         const layer = $("session-action-menu-layer");
         if (layer) {
@@ -43655,7 +43286,7 @@ Waiting for Claude login output…</pre
         const closingState = sessionActionMenuState;
         closingState?.expandedButton?.setAttribute?.("aria-expanded", "false");
         const currentExpandedButton = closingState?.sessionId
-          ? document.querySelector(
+          ? querySessionRowElement(
               `[data-session-action-menu-session-id="${CSS.escape(
                 closingState.sessionId
               )}"]`
@@ -43674,7 +43305,7 @@ Waiting for Claude login output…</pre
                   closingState.kind === "history"
                     ? "data-history-session-id"
                     : "data-live-session-id";
-                const currentRow = document.querySelector(
+                const currentRow = querySessionRowElement(
                   `[${rowAttribute}="${CSS.escape(closingState.sessionId)}"]`
                 );
                 focusTarget =
@@ -43875,6 +43506,8 @@ Waiting for Claude login output…</pre
             liveSession.agentFolder ||
             liveSession.agent_folder ||
             "",
+          // A running Session has no Host-resolved History folder location.
+          agent_folder_real_path: null,
           runtime: liveSession.provider || liveSession.runtime || null,
           model: liveSession.model || null,
           // Only editable setup values cross this boundary. Native/thread,
@@ -44065,6 +43698,53 @@ Waiting for Claude login output…</pre
         });
       }
 
+      // Shared History Resume eligibility. The Sessions row menu and the
+      // folder Session page buttons use the same pre-check and settle rules.
+      function getHistoryResumePreCheckState(sessionId) {
+        const historyRecord = getHistorySessionRecord(sessionId);
+        const desiredRestore = getDesiredOpenRestoreSession(sessionId);
+        if (historyRecord?.restore_failed !== true) {
+          failedResumeAvailabilityBySession.delete(sessionId);
+        }
+        return desiredRestore &&
+          desiredRestore.state !== "failed" &&
+          desiredRestore.state !== "ready"
+          ? "restoring"
+          : "";
+      }
+
+      function settleHistoryResumeState(sessionId, resumeCheckFailed) {
+        const historyRecord = getHistorySessionRecord(sessionId);
+        let resumeState = resumeCheckFailed
+          ? "retry"
+          : historySessionCanResume(sessionId)
+          ? "supported"
+          : "unavailable";
+        if (historyRecord?.restore_failed === true && !resumeCheckFailed) {
+          const signature = historyResumeAvailabilitySignature(sessionId);
+          const previous = failedResumeAvailabilityBySession.get(sessionId);
+          const availabilityChanged =
+            previous && previous.signature !== signature;
+          const unlocked = Boolean(previous?.unlocked || availabilityChanged);
+          failedResumeAvailabilityBySession.set(sessionId, {
+            signature,
+            unlocked,
+          });
+          // A failed provider Resume stays disabled on this check. A later
+          // check may offer Resume Chat only after availability changes and
+          // the full transcript/provider eligibility check passes.
+          if (
+            !unlocked &&
+            !isDeterministicRestoreUnavailableReason(
+              historyRecord.restore_failed_reason
+            )
+          ) {
+            resumeState = "unavailable";
+          }
+        }
+        return resumeState;
+      }
+
       function canSettleSessionActionMenu(openedState, currentState, signal) {
         return currentState === openedState && signal?.aborted !== true;
       }
@@ -44275,15 +43955,8 @@ Waiting for Claude login output…</pre
           installSessionActionMenuEnvironmentalDismissHandlers();
         if (normalizedKind === "history") {
           const historyRecord = getHistorySessionRecord(normalizedSessionId);
-          const desiredRestore =
-            getDesiredOpenRestoreSession(normalizedSessionId);
-          if (historyRecord?.restore_failed !== true) {
-            failedResumeAvailabilityBySession.delete(normalizedSessionId);
-          }
           if (
-            desiredRestore &&
-            desiredRestore.state !== "failed" &&
-            desiredRestore.state !== "ready"
+            getHistoryResumePreCheckState(normalizedSessionId) === "restoring"
           ) {
             renderOpenSessionActionMenu(
               anchorButton,
@@ -44361,35 +44034,10 @@ Waiting for Claude login output…</pre
           ) {
             return;
           }
-          let resumeState = resumeCheckFailed
-            ? "retry"
-            : historySessionCanResume(normalizedSessionId)
-            ? "supported"
-            : "unavailable";
-          if (historyRecord?.restore_failed === true && !resumeCheckFailed) {
-            const signature =
-              historyResumeAvailabilitySignature(normalizedSessionId);
-            const previous =
-              failedResumeAvailabilityBySession.get(normalizedSessionId);
-            const availabilityChanged =
-              previous && previous.signature !== signature;
-            const unlocked = Boolean(previous?.unlocked || availabilityChanged);
-            failedResumeAvailabilityBySession.set(normalizedSessionId, {
-              signature,
-              unlocked,
-            });
-            // A failed provider Resume stays disabled on this menu opening.
-            // A later opening may offer Resume Chat only after availability
-            // changes and the full transcript/provider eligibility check passes.
-            if (
-              !unlocked &&
-              !isDeterministicRestoreUnavailableReason(
-                historyRecord.restore_failed_reason
-              )
-            ) {
-              resumeState = "unavailable";
-            }
-          }
+          const resumeState = settleHistoryResumeState(
+            normalizedSessionId,
+            resumeCheckFailed
+          );
           openedMenuState.resumeState = resumeState;
           renderOpenSessionActionMenu(
             anchorButton,
@@ -44662,7 +44310,11 @@ Waiting for Claude login output…</pre
         `;
       }
 
-      function renderHistorySessionRow(record) {
+      // `inlineActions` (folder Session page) replaces the row-menu trigger
+      // with a non-interactive row body plus the given inline action buttons.
+      function renderHistorySessionRow(record, opts = {}) {
+        const inlineActions =
+          typeof opts.inlineActions === "string" ? opts.inlineActions : null;
         const runtime = record.runtime || "claude";
         const model = record.model || "default model";
         const displayName = getHistorySessionDisplayName(record);
@@ -44681,30 +44333,7 @@ Waiting for Claude login output…</pre
         const expanded =
           sessionActionMenuState?.sessionId === record.session_id &&
           sessionActionMenuState?.kind === "history";
-        return `
-          <article
-            class="collection-row session-list-row session-list-row-history"
-            data-history-session-id="${esc(record.session_id)}"
-            data-agent-id="${esc(record.agent_id)}"
-            data-session-preview-status="${esc(
-              previewState?.status || "loading"
-            )}"
-            data-completed-session-unread="${unread ? "true" : "false"}"
-          >
-            <button
-              class="collection-row-main session-row-main"
-              type="button"
-              data-session-action-menu-session-id="${esc(record.session_id)}"
-              data-session-action-menu-kind="history"
-              aria-haspopup="menu"
-              aria-expanded="${String(expanded)}"
-              aria-label="Session actions for ${esc(displayName)}${
-          unread ? ", unread completed message" : ""
-        }"
-              data-session-base-aria-label="Session actions for ${esc(
-                displayName
-              )}"
-            >
+        const rowBody = `
               ${renderSessionUnreadSlot(unread)}
               ${renderSessionAvatar(runtime, false)}
               <span class="collection-row-copy session-row-copy">
@@ -44728,7 +44357,38 @@ Waiting for Claude login output…</pre
                 </span>
                 ${renderSessionTagDiagnostic(record)}
               </span>
-            </button>
+            `;
+        return `
+          <article
+            class="collection-row session-list-row session-list-row-history${
+              inlineActions === null ? "" : " session-list-row-inline-actions"
+            }"
+            data-history-session-id="${esc(record.session_id)}"
+            data-agent-id="${esc(record.agent_id)}"
+            data-session-preview-status="${esc(
+              previewState?.status || "loading"
+            )}"
+            data-completed-session-unread="${unread ? "true" : "false"}"
+          >
+            ${
+              inlineActions === null
+                ? `<button
+              class="collection-row-main session-row-main"
+              type="button"
+              data-session-action-menu-session-id="${esc(record.session_id)}"
+              data-session-action-menu-kind="history"
+              aria-haspopup="menu"
+              aria-expanded="${String(expanded)}"
+              aria-label="Session actions for ${esc(displayName)}${
+                    unread ? ", unread completed message" : ""
+                  }"
+              data-session-base-aria-label="Session actions for ${esc(
+                displayName
+              )}"
+            >${rowBody}</button>`
+                : `<div class="collection-row-main session-row-main">${rowBody}</div>
+            <div class="session-row-inline-actions">${inlineActions}</div>`
+            }
           </article>
         `;
       }
@@ -44797,7 +44457,262 @@ Waiting for Claude login output…</pre
           </section>`;
       }
 
+      // Resume Session compares real filesystem locations: the chosen folder
+      // is resolved by the Host and each History row carries the Host-resolved
+      // agent_folder_real_path, so path spelling, aliases and symlinks match.
+      let folderSessionsFolderResolution = {
+        folder: "",
+        realPath: "",
+        error: "",
+      };
+
+      function resolveFolderSessionsFolder(folder) {
+        if (folderSessionsFolderResolution.folder === folder) {
+          return folderSessionsFolderResolution;
+        }
+        const resolution = { folder, realPath: "", error: "" };
+        folderSessionsFolderResolution = resolution;
+        apiWithAuthRetry("POST", "/dev/folders/validate", { path: folder })
+          .then((result) => {
+            const realPath = sanitizeRouteText(result?.path);
+            if (!realPath) {
+              throw new Error("Folder validation did not return a real path.");
+            }
+            resolution.realPath = realPath;
+          })
+          .catch((err) => {
+            resolution.error = err?.message || String(err);
+            showBanner(
+              `Could not resolve this folder: ${resolution.error}`,
+              true
+            );
+          })
+          .finally(() => {
+            if (folderSessionsFolderResolution === resolution) {
+              renderFolderSessionsView();
+            }
+          });
+        return resolution;
+      }
+
+      function getFolderSessionsHistoryRecords(folderRealPath) {
+        const liveSessionIds = new Set(
+          liveSessions.map((entry) => entry.sessionId)
+        );
+        return sessionHistory.filter((record) => {
+          if (liveSessionIds.has(record.session_id)) return false;
+          if (record.agent_folder_real_path === undefined) {
+            throw new Error(
+              `History Session ${record.session_id} is missing agent_folder_real_path.`
+            );
+          }
+          return record.agent_folder_real_path === folderRealPath;
+        });
+      }
+
+      // Resume button state per Session on the folder Session page: one forced
+      // eligibility read per agent, settled with the shared History rules.
+      let folderSessionsResumeStates = new Map();
+
+      function checkFolderSessionsResume(records, opts = {}) {
+        const pending = records.filter(
+          (record) =>
+            opts.force === true ||
+            !folderSessionsResumeStates.has(record.session_id)
+        );
+        const checksByAgent = new Map();
+        for (const record of pending) {
+          if (
+            getHistoryResumePreCheckState(record.session_id) === "restoring"
+          ) {
+            folderSessionsResumeStates.set(record.session_id, {
+              resumeState: "restoring",
+            });
+            continue;
+          }
+          folderSessionsResumeStates.set(record.session_id, {
+            resumeState: "checking",
+          });
+          const group = checksByAgent.get(record.agent_id) || [];
+          group.push(record.session_id);
+          checksByAgent.set(record.agent_id, group);
+        }
+        for (const sessionIds of checksByAgent.values()) {
+          const checkingPresentation =
+            waitForHistoryResumeCheckingPresentation();
+          void validateHistorySessionResumeMembership(sessionIds[0], {
+            force: true,
+          })
+            .then(
+              () => ({ failed: false, timedOut: false }),
+              (err) => {
+                console.warn(
+                  "[oysterun-ui] Could not check folder Session Resume",
+                  err
+                );
+                return {
+                  failed: true,
+                  timedOut: err?.code === "history_resume_check_timeout",
+                };
+              }
+            )
+            .then(async (result) => {
+              await checkingPresentation;
+              for (const sessionId of sessionIds) {
+                if (
+                  folderSessionsResumeStates.get(sessionId)?.resumeState !==
+                  "checking"
+                )
+                  continue;
+                const resumeState = settleHistoryResumeState(
+                  sessionId,
+                  result.failed
+                );
+                folderSessionsResumeStates.set(sessionId, {
+                  resumeState,
+                  resumeCheckTimedOut: result.timedOut,
+                  resumeUnavailableReason:
+                    resumeState === "unavailable"
+                      ? historySessionResumeMenuUnavailableReason(sessionId)
+                      : "",
+                });
+              }
+              renderFolderSessionsView();
+            });
+        }
+      }
+
+      function renderFolderSessionsActionButton(item) {
+        const accessibleLabel = [item.label, item.reason]
+          .filter(Boolean)
+          .join(". ");
+        const disabled = item.disabled === true;
+        return `
+          <button
+            class="session-row-inline-action"
+            type="button"
+            data-folder-sessions-action="${esc(item.action)}"
+            ${
+              item.resumeState
+                ? `data-history-resume-state="${esc(item.resumeState)}"`
+                : ""
+            }
+            aria-label="${esc(accessibleLabel)}"
+            title="${esc(accessibleLabel)}"
+            aria-disabled="${String(disabled)}"
+            ${disabled ? "disabled" : ""}
+          >
+            <span class="session-row-menu-action-icon">${renderSessionActionIcon(
+              item.icon
+            )}</span>
+          </button>
+        `;
+      }
+
+      // Inline Resume and Duplicate Setup use the History menu items, so labels,
+      // enablement and unavailable reasons match the Sessions row menu.
+      function renderFolderSessionsRowActions(record) {
+        const state = folderSessionsResumeStates.get(record.session_id) || {
+          resumeState: "checking",
+        };
+        const items = getSessionActionMenuItems("history", record.session_id, {
+          resumeState: state.resumeState,
+          resumeCheckTimedOut: state.resumeCheckTimedOut === true,
+          resumeUnavailableReason: state.resumeUnavailableReason || "",
+        });
+        const resumeItem = items.find((item) => item.resumeState);
+        const duplicateItem = items.find((item) => item.action === "duplicate");
+        if (!resumeItem || !duplicateItem) {
+          throw new Error(
+            "History actions must include Resume and Duplicate Setup."
+          );
+        }
+        return [resumeItem, duplicateItem]
+          .map(renderFolderSessionsActionButton)
+          .join("");
+      }
+
+      function wireFolderSessionsView(container, folder) {
+        container
+          .querySelector("[data-folder-sessions-new-session]")
+          ?.addEventListener("click", () => {
+            void navigateToRoute(buildSessionSetupRoute({ folder }));
+          });
+        for (const button of container.querySelectorAll(
+          "[data-folder-sessions-action]"
+        )) {
+          button.addEventListener("click", () => {
+            const sessionId =
+              button.closest("[data-history-session-id]")?.dataset
+                .historySessionId || "";
+            const action = button.dataset.folderSessionsAction;
+            if (!sessionId) return;
+            if (action === "resume") {
+              void openHistorySession(sessionId, { resume: true });
+            } else if (action === "duplicate") {
+              void openHistorySession(sessionId, { resume: false });
+            } else if (action === "retry_resume_check") {
+              // Retries only the availability read, never provider Resume.
+              const record = getHistorySessionRecord(sessionId);
+              if (record) checkFolderSessionsResume([record], { force: true });
+              renderFolderSessionsView();
+            }
+          });
+        }
+      }
+
+      function renderFolderSessionsView() {
+        const route = normalizeClientRoute(getCurrentRoute());
+        const container = $("folder-sessions-list");
+        if (route.screen !== "folder-sessions" || !container) return;
+        const resolution = resolveFolderSessionsFolder(route.folder);
+        const historyLoaded = Boolean(dashboardAppliedCollectionIdentity);
+        const ready = historyLoaded && Boolean(resolution.realPath);
+        const records = ready
+          ? getFolderSessionsHistoryRecords(resolution.realPath)
+          : [];
+        if (records.length) checkFolderSessionsResume(records);
+        const historyRows = records
+          .map((record) =>
+            renderHistorySessionRow(record, {
+              inlineActions: renderFolderSessionsRowActions(record),
+            })
+          )
+          .join("");
+        container.dataset.folderSessionsFolder = route.folder;
+        container.dataset.folderSessionsFolderRealPath = resolution.realPath;
+        container.innerHTML = `
+          <div class="folder-sessions-intro">
+            <div class="surface-action-row">
+              <button
+                class="btn-primary"
+                type="button"
+                data-folder-sessions-new-session="true"
+                data-oysterun-normal-session-start-action="true"
+              >＋ New Session</button>
+            </div>
+            ${
+              historyRows
+                ? '<div class="meta-text folder-sessions-label">Previous Sessions</div>'
+                : ""
+            }
+          </div>
+          ${
+            historyRows
+              ? `<div class="session-section-rows">${historyRows}</div>`
+              : ready
+              ? `<div class="empty-state sessions-empty-state">
+            <div class="sessions-empty-icon" aria-hidden="true"></div>
+            <strong>No previous Sessions in this folder.</strong>
+          </div>`
+              : ""
+          }
+        `;
+        wireFolderSessionsView(container, route.folder);
+      }
+
       function renderCatalog() {
+        renderFolderSessionsView();
         const entryContainer = $("entry-agent-list");
         const focusedSessionTagGroupIdentity =
           document.activeElement?.dataset?.sessionTagGroupToggle || "";
@@ -46367,8 +46282,7 @@ Waiting for Claude login output…</pre
         }
       }
 
-      function wireEntryCardEvents() {
-        const entryContainer = $("entry-agent-list");
+      function wireEntryCardEvents(entryContainer = $("entry-agent-list")) {
         if (!entryContainer) return;
 
         for (const toggle of entryContainer.querySelectorAll(
@@ -47046,7 +46960,6 @@ Waiting for Claude login output…</pre
             : HOST_DEFAULT_SESSION_DEFAULTS.xai.approvalPolicy;
         const savedDraft = buildHostPreferencesDraft({
           displayName: data.display_name || "",
-          publicBaseUrl: data.direct_host_url || data.public_base_url || "",
           defaultBrowsePath: data.default_browse_path || "",
           notificationSoundWebEnabled,
           notificationSoundAppEnabled,
@@ -47091,7 +47004,6 @@ Waiting for Claude login output…</pre
           loaded: true,
           loading: false,
           saving: false,
-          connectionMode: data.connection_mode === "cloud" ? "cloud" : "direct",
           platform: typeof data.platform === "string" ? data.platform : "",
           folderAccessSettingsSupported:
             data.folder_access_settings_supported === true,
@@ -47165,8 +47077,6 @@ Waiting for Claude login output…</pre
           allowedPathDisabled,
           allowedPathDebugUiEnabled,
           providerPermissionDebugModeDropdownEnabled,
-          publicBaseUrl: data.direct_host_url || data.public_base_url || "",
-          activeDirectHostUrl: data.active_direct_host_url || "",
           managedTunnelEnabled: data.managed_tunnel_enabled === true,
           managedTunnelStatus:
             data.managed_tunnel_status === "ready" ||
@@ -47202,8 +47112,6 @@ Waiting for Claude login output…</pre
             hostPreferencesState.notificationServiceWorkerState || "unknown",
           notificationLastError:
             hostPreferencesState.notificationLastError || "",
-          directHostUrlRestartRequired:
-            data.direct_host_url_restart_required === true,
           hostRestartSupported: data.host_restart_supported === true,
           loginQr: hostPreferencesState.loginQr,
           loginQrLoading: false,
@@ -49844,10 +49752,6 @@ Waiting for Claude login output…</pre
         if (displayNameInput && document.activeElement !== displayNameInput) {
           displayNameInput.value = hostPreferencesState.displayName || "";
         }
-        const publicUrlInput = $("host-public-base-url");
-        if (publicUrlInput && document.activeElement !== publicUrlInput) {
-          publicUrlInput.value = hostPreferencesState.publicBaseUrl || "";
-        }
         if ($("host-default-provider")) {
           renderHostDefaultProviderOptions();
         }
@@ -49958,11 +49862,6 @@ Waiting for Claude login output…</pre
           "disabled",
           providerCatalogState.loading
         );
-        const loginQrUsesManagedEndpoint =
-          hostPreferencesState.connectionMode === "cloud";
-        const directAccessHint = loginQrUsesManagedEndpoint
-          ? "Managed login QR uses the healthy Oysterun Managed Endpoint. Direct Host URL remains available for manual Direct access."
-          : "Used by app login QR and manual iPhone connection. Save changes before generating QR.";
         const localUrlInput = $("host-preferences-local-url");
         if (localUrlInput) {
           localUrlInput.value = hostPreferencesState.localUrl || "";
@@ -49999,10 +49898,10 @@ Waiting for Claude login output…</pre
           "host-managed-tunnel-status-hint",
           managedTunnelStatus === "denied"
             ? hostPreferencesState.managedTunnelStatusDetail ||
-                "Managed registration was denied. Direct Host access remains available."
+                "Managed registration was denied. This Host's Tunnel URL is not reachable until registration succeeds."
             : managedTunnelStatus === "pending"
             ? hostPreferencesState.managedTunnelStatusDetail ||
-              "Managed Connector is still retrying. Direct Host access remains available."
+              "Managed Connector is still retrying. The Host service runs locally, but its Tunnel URL is not reachable yet."
             : ""
         );
         const managedQuota = hostPreferencesState.managedTunnelQuota;
@@ -50177,49 +50076,21 @@ Waiting for Claude login output…</pre
           "disabled",
           !managedDiagnostics
         );
-        setText("host-public-base-url-hint", directAccessHint);
-        const directUrlCopyButton = $("host-public-base-url-copy-btn");
-        if (directUrlCopyButton) {
-          directUrlCopyButton.disabled = !String(
-            publicUrlInput?.value || hostPreferencesState.publicBaseUrl || ""
-          ).trim();
-        }
-        const hasDirectAccessDraftChanges = hasUnsavedHostPreferencesChanges();
-        const savedDirectHostUrl = hostPreferencesState.publicBaseUrl || "";
-        const activeDirectHostUrl =
-          hostPreferencesState.activeDirectHostUrl || savedDirectHostUrl;
+        // Every login QR carries this Host's formal URL: its registered Tunnel URL.
         const managedLoginQrReady =
           hostPreferencesState.managedTunnelEnabled &&
           managedTunnelStatus === "ready" &&
           Boolean(hostPreferencesState.managedEndpoint);
-        const loginQrBlockedByDraftChanges =
-          !loginQrUsesManagedEndpoint && hasDirectAccessDraftChanges;
-        const loginQrTargetReady = loginQrUsesManagedEndpoint
-          ? managedLoginQrReady
-          : Boolean(savedDirectHostUrl);
+        const hasDirectAccessDraftChanges = hasUnsavedHostPreferencesChanges();
+        const loginQrTargetReady = managedLoginQrReady;
         let directAccessStatus = "";
         if (hostPreferencesState.loginQrError) {
           directAccessStatus = hostPreferencesState.loginQrError;
-        } else if (loginQrUsesManagedEndpoint) {
+        } else {
           directAccessStatus = managedLoginQrReady
             ? `QR will use Oysterun Managed Endpoint ${hostPreferencesState.managedEndpoint}.`
             : hostPreferencesState.managedTunnelStatusDetail ||
               "Managed Endpoint must be Ready before generating a login QR.";
-        } else if (hostPreferencesState.directHostUrlRestartRequired) {
-          directAccessStatus =
-            "Saved URL differs from the running Host URL. Restart Host before using the new app connection URL.";
-        } else if (savedDirectHostUrl) {
-          directAccessStatus = `QR will use ${savedDirectHostUrl}.`;
-        } else {
-          directAccessStatus =
-            "Set a Direct Host URL before generating a login QR.";
-        }
-        if (
-          activeDirectHostUrl &&
-          savedDirectHostUrl &&
-          activeDirectHostUrl !== savedDirectHostUrl
-        ) {
-          directAccessStatus += ` Running URL: ${activeDirectHostUrl}.`;
         }
         setText("host-direct-access-status", directAccessStatus);
         const restartHandoff = hostPreferencesState.restartHandoff;
@@ -50247,7 +50118,6 @@ Waiting for Claude login output…</pre
           qrButton.disabled =
             disabled ||
             hostPreferencesState.loginQrLoading ||
-            loginQrBlockedByDraftChanges ||
             !loginQrTargetReady;
           qrButton.textContent = hostPreferencesState.loginQrLoading
             ? "Generating..."
@@ -50255,9 +50125,11 @@ Waiting for Claude login output…</pre
         }
         const restartButton = $("host-restart-btn");
         if (restartButton) {
-          const restartBlockedByUpdate = isOysterunUpdateOperationBlocking(
-            hostPreferencesState.update
-          );
+          // An unfinished restart continues through Restart Host itself.
+          const restartBlockedByUpdate =
+            isOysterunUpdateOperationBlocking(hostPreferencesState.update) &&
+            getHostLifecycleRecoveryUserAction(hostPreferencesState.update)
+              ?.kind !== "restart_only";
           restartButton.disabled =
             disabled ||
             hostPreferencesState.restartLoading ||
@@ -50336,10 +50208,18 @@ Waiting for Claude login output…</pre
           betaUpdateVisible && hostPreferencesState.betaUpdateRefreshing
         );
         const updatePhase = getOysterunUpdatePhase(update);
+        const restartRecoveryDescription =
+          getHostLifecycleRecoveryUserAction(update)?.kind === "restart_only"
+            ? getHostLifecycleRecoveryUserAction(update).description || ""
+            : "";
         setText(
           "host-restart-status",
           hostPreferencesState.restartStatus ||
-            (restartOperation ? updatePhase : "")
+            (restartOperation
+              ? [updatePhase, restartRecoveryDescription]
+                  .filter(Boolean)
+                  .join(" ")
+              : "")
         );
         setText("host-update-phase", restartOperation ? "" : updatePhase);
         setText(
@@ -50358,7 +50238,16 @@ Waiting for Claude login output…</pre
           typeof recoveryPlan.user_action === "object"
             ? recoveryPlan.user_action
             : null;
-        const updateRecoveryRequired = Boolean(recoveryAction?.kind);
+        // Restart and update continuations use Restart Host / Update & Restart;
+        // only Restore and the unverifiable-data diagnostics keep this entry.
+        const updateEntryRecovery = [
+          "complete_update_and_restart",
+          "repair_and_restart",
+        ].includes(recoveryAction?.kind);
+        const updateRecoveryRequired = [
+          "restore_and_restart",
+          "export_diagnostics",
+        ].includes(recoveryAction?.kind);
         const recoveryButton = $("host-update-recovery-btn");
         if (recoveryButton) {
           recoveryButton.classList.toggle("hidden", !updateRecoveryRequired);
@@ -50371,17 +50260,35 @@ Waiting for Claude login output…</pre
               ? "Working..."
               : recoveryAction?.label || "Download diagnostic summary";
         }
+        // P298 (Owner decision A): a recovery whose card button opens a
+        // confirmation also offers the redacted summary on the card, before it.
+        const cardDiagnosticsButton = $("host-update-card-diagnostics-btn");
+        if (cardDiagnosticsButton) {
+          cardDiagnosticsButton.classList.toggle(
+            "hidden",
+            recoveryAction?.kind !== "restore_and_restart" ||
+              updateOperationRunning
+          );
+          cardDiagnosticsButton.disabled =
+            disabled || hostPreferencesState.updateRecoveryChecking;
+          cardDiagnosticsButton.textContent =
+            hostPreferencesState.updateRecoveryChecking
+              ? "Preparing summary..."
+              : "Download diagnostic summary";
+        }
+        const updateRecoveryDescription =
+          recoveryAction?.kind === "restart_only"
+            ? ""
+            : recoveryAction?.description || "";
         setText(
           "host-update-recovery-status",
-          hostPreferencesState.updateRecoveryStatus ||
-            recoveryAction?.description ||
-            ""
+          hostPreferencesState.updateRecoveryStatus || updateRecoveryDescription
         );
         setVisible(
           "host-update-recovery-status",
           Boolean(
             hostPreferencesState.updateRecoveryStatus ||
-              recoveryAction?.description
+              updateRecoveryDescription
           )
         );
         const updateCanRun =
@@ -50485,13 +50392,16 @@ Waiting for Claude login output…</pre
         }
         const updateRunButton = $("host-update-run-btn");
         if (updateRunButton) {
+          // A prepared or unfinished install continues its original operation
+          // through Update & Restart; otherwise this starts a new update.
           updateRunButton.disabled =
             disabled ||
             hostPreferencesState.updateChecking ||
             hostPreferencesState.updateRunning ||
-            updateOperationBlocking ||
             updateConfirmationVisible ||
-            !updateCanRun;
+            (updateEntryRecovery
+              ? updateOperationRunning
+              : updateOperationBlocking || !updateCanRun);
           updateRunButton.textContent = hostPreferencesState.updateRunning
             ? "Installing..."
             : "Update & Restart";
@@ -50537,6 +50447,12 @@ Waiting for Claude login output…</pre
             ? "Confirm beta install and restart"
             : "Confirm update and restart"
         );
+        setText(
+          "host-update-confirmation-warning",
+          recoveryConfirmation
+            ? "Oysterun continues this operation with its retained Session restore state; a new one is prepared only if the operation stopped before its first restart. Loops remain off. Active provider replies, terminal commands, loop turns, and scheduler work may be marked interrupted and will not be replayed."
+            : "Oysterun will prepare restore state for existing Sessions before restarting Host. Loops remain off. Active provider replies, terminal commands, loop turns, and scheduler work may be marked interrupted and will not be replayed."
+        );
         setText("host-update-confirmation-current", updateCurrentVersion);
         setText("host-update-confirmation-target", updateTargetVersion);
         setText(
@@ -50582,12 +50498,32 @@ Waiting for Claude login output…</pre
           updateConfirmRunButton.disabled =
             disabled || !updateConfirmationVisible;
           updateConfirmRunButton.textContent = recoveryConfirmation
-            ? recoveryAction?.label || "Confirm recovery and restart"
+            ? getHostLifecycleRecoveryPrimaryLabel(updateConfirmationMode)
             : updateConfirmationMode === "beta"
             ? "Confirm Beta Install & Restart"
             : "Confirm Update & Restart";
           setVisible("host-update-confirm-run-btn", updateConfirmationVisible);
         }
+        // Failure/recovery confirmations offer the redacted summary as a
+        // secondary action next to Cancel and the primary operation. Restore
+        // offers it on the card instead (P298, Owner decision X).
+        const updateConfirmDiagnosticsButton = $(
+          "host-update-confirm-diagnostics-btn"
+        );
+        if (updateConfirmDiagnosticsButton) {
+          updateConfirmDiagnosticsButton.disabled =
+            disabled || hostPreferencesState.updateRecoveryChecking;
+          updateConfirmDiagnosticsButton.textContent =
+            hostPreferencesState.updateRecoveryChecking
+              ? "Preparing summary..."
+              : "Download diagnostic summary";
+          setVisible(
+            "host-update-confirm-diagnostics-btn",
+            updateConfirmationVisible &&
+              recoveryConfirmation &&
+              updateConfirmationMode !== "restore_and_restart"
+          );
+        }
         const updateConfirmCancelButton = $("host-update-confirm-cancel-btn");
         if (updateConfirmCancelButton) {
           updateConfirmCancelButton.disabled = disabled;
@@ -50643,7 +50579,6 @@ Waiting for Claude login output…</pre
         showError("host-preferences-error", hostPreferencesState.error);
         const defaultProviderDisabled =
           providerControlsDisabled || getAvailableProviderIds().length === 0;
-        const publicUrlDisabled = disabled;
         const folderAccessVisible =
           hostPreferencesState.platform === "darwin" &&
           hostPreferencesState.folderAccessSettingsSupported === true &&
@@ -50698,10 +50633,6 @@ Waiting for Claude login output…</pre
         renderHostNotificationPreferences({ disabled });
         renderHostVoiceInputPreferences({ disabled });
         setVisible("host-folder-access-card", folderAccessVisible);
-        $("host-public-base-url")?.toggleAttribute(
-          "disabled",
-          publicUrlDisabled
-        );
         $("host-display-name")?.toggleAttribute("disabled", disabled);
         $("host-default-browse-path")?.toggleAttribute("disabled", disabled);
         $("host-default-browse-path-picker")?.toggleAttribute(
@@ -50829,18 +50760,6 @@ Waiting for Claude login output…</pre
 
       async function generateDirectHostLoginQr() {
         if (hostPreferencesState.loginQrLoading) return;
-        if (
-          hostPreferencesState.connectionMode !== "cloud" &&
-          hasUnsavedHostPreferencesChanges()
-        ) {
-          hostPreferencesState = {
-            ...hostPreferencesState,
-            loginQrError:
-              "Save Direct Host URL changes before generating a login QR.",
-          };
-          renderHostPreferences();
-          return;
-        }
         hostPreferencesState = {
           ...hostPreferencesState,
           loginQrLoading: true,
@@ -50876,6 +50795,19 @@ Waiting for Claude login output…</pre
 
       async function restartHostFromPreferences() {
         if (hostPreferencesState.restartLoading) return;
+        // An unfinished restart continues with its original Session snapshot
+        // after the existing recovery confirmation.
+        const retained = getHostLifecycleRecoveryUserAction(
+          hostPreferencesState.update
+        );
+        if (
+          retained?.kind === "restart_only" &&
+          !hostPreferencesState.loading &&
+          !hostPreferencesState.saving
+        ) {
+          openHostLifecycleRecoveryConfirmation(retained);
+          return;
+        }
         if (
           hostPreferencesState.loading ||
           hostPreferencesState.saving ||
@@ -51081,32 +51013,46 @@ Waiting for Claude login output…</pre
         }
       }
 
-      async function runOysterunRecoveryAction() {
-        if (hostPreferencesState.updateRecoveryChecking) return;
+      function getHostLifecycleRecoveryUserAction(update) {
+        const action = update?.recovery_plan?.user_action;
+        return action && typeof action === "object" && action.kind
+          ? action
+          : null;
+      }
+
+      function getHostLifecycleRecoveryPrimaryLabel(kind) {
+        // The confirmation keeps the real operation name of its entry.
+        if (kind === "restart_only") return "Restart Host";
+        if (kind === "restore_and_restart") return "Restore and restart";
+        return "Update & Restart";
+      }
+
+      function openHostLifecycleRecoveryConfirmation(action) {
         const update = hostPreferencesState.update || {};
-        const action = update.recovery_plan?.user_action || null;
-        if (!action?.kind) return;
-        if (action.kind !== "export_diagnostics") {
-          hostPreferencesState = {
-            ...hostPreferencesState,
-            updateConfirmationVisible: true,
-            updateConfirmationMode: action.kind,
-            updateConfirmationCurrentVersion:
-              update.current_version || "the current version",
-            updateConfirmationTargetVersion:
-              action.target_version ||
-              update.update_operation?.target_version ||
-              update.update_operation?.last_working_version ||
-              "the retained version",
-            updateRecoveryStatus: action.description || "",
-            updateError: "",
-          };
-          renderHostPreferences();
-          window.setTimeout(() => {
-            $("host-update-confirm-run-btn")?.focus();
-          }, 0);
-          return;
-        }
+        hostPreferencesState = {
+          ...hostPreferencesState,
+          updateConfirmationVisible: true,
+          updateConfirmationMode: action.kind,
+          updateConfirmationCurrentVersion:
+            update.current_version || "the current version",
+          updateConfirmationTargetVersion:
+            action.target_version ||
+            update.update_operation?.target_version ||
+            update.update_operation?.last_working_version ||
+            "the retained version",
+          updateRecoveryStatus: "",
+          updateError: "",
+        };
+        renderHostPreferences();
+        window.setTimeout(() => {
+          $("host-update-confirm-run-btn")?.focus();
+        }, 0);
+      }
+
+      // Fetches only the redacted summary; never runs install, restore or
+      // restart and leaves any open confirmation as it is.
+      async function downloadHostLifecycleDiagnosticSummary() {
+        if (hostPreferencesState.updateRecoveryChecking) return;
         hostPreferencesState = {
           ...hostPreferencesState,
           updateRecoveryChecking: true,
@@ -51135,6 +51081,7 @@ Waiting for Claude login output…</pre
               "Redacted diagnostic summary downloaded. The current Host was not changed.",
           };
         } catch (error) {
+          if (await handleHostPreferencesAuthFailure(error)) return;
           hostPreferencesState = {
             ...hostPreferencesState,
             updateRecoveryChecking: false,
@@ -51144,12 +51091,42 @@ Waiting for Claude login output…</pre
         renderHostPreferences();
       }
 
+      async function runOysterunRecoveryAction() {
+        if (hostPreferencesState.updateRecoveryChecking) return;
+        const action = getHostLifecycleRecoveryUserAction(
+          hostPreferencesState.update
+        );
+        if (!action) return;
+        if (action.kind === "export_diagnostics") {
+          await downloadHostLifecycleDiagnosticSummary();
+          return;
+        }
+        if (action.kind !== "restore_and_restart") return;
+        openHostLifecycleRecoveryConfirmation(action);
+      }
+
       async function runOysterunUpdate() {
         if (
           hostPreferencesState.updateRunning ||
-          hostPreferencesState.updateChecking ||
-          isOysterunUpdateOperationBlocking(hostPreferencesState.update)
+          hostPreferencesState.updateChecking
+        ) {
+          return;
+        }
+        // A prepared update or unfinished install continues its original
+        // operation and exact version instead of selecting a new release.
+        const retained = getHostLifecycleRecoveryUserAction(
+          hostPreferencesState.update
+        );
+        if (
+          retained &&
+          ["complete_update_and_restart", "repair_and_restart"].includes(
+            retained.kind
+          )
         ) {
+          openHostLifecycleRecoveryConfirmation(retained);
+          return;
+        }
+        if (isOysterunUpdateOperationBlocking(hostPreferencesState.update)) {
           return;
         }
         const update = hostPreferencesState.update || {};
@@ -51233,10 +51210,11 @@ Waiting for Claude login output…</pre
         };
         renderHostPreferences();
         window.setTimeout(() => {
-          const recoveryMode =
-            HOST_LIFECYCLE_RECOVERY_MODES.includes(confirmationMode);
+          // Return focus to the entry that opened the confirmation.
           $(
-            recoveryMode
+            confirmationMode === "restart_only"
+              ? "host-restart-btn"
+              : confirmationMode === "restore_and_restart"
               ? "host-update-recovery-btn"
               : confirmationMode === "beta"
               ? "host-update-beta-run-btn"
@@ -51588,19 +51566,6 @@ Waiting for Claude login output…</pre
           renderHostPreferences();
           return;
         }
-        const confirmProviderPermissionMode =
-          requiresProviderPermissionPolicyConfirmation(
-            "claude",
-            currentDraft.claudePermissionMode
-          ) ||
-          requiresProviderPermissionPolicyConfirmation(
-            "codex",
-            currentDraft.codexApprovalPolicy
-          ) ||
-          requiresProviderPermissionPolicyConfirmation(
-            "xai",
-            currentDraft.xaiApprovalPolicy
-          );
         const preferencesPayload = serializeHostPreferencesDraft(currentDraft);
         hostPreferencesState = {
           ...hostPreferencesState,
@@ -51609,9 +51574,6 @@ Waiting for Claude login output…</pre
         };
         renderHostPreferences();
         try {
-          if (confirmProviderPermissionMode) {
-            preferencesPayload.confirm_beta_provider_permission_mode = true;
-          }
           const data = await apiWithAuthRetry(
             "PUT",
             "/dev/preferences",
@@ -63731,14 +63693,6 @@ Waiting for Claude login output…</pre
         if (isAllowedPathDebugUiVisible()) {
           payload.allowed_paths = allowedPaths;
         }
-        if (
-          requiresProviderPermissionPolicyConfirmation(
-            createRuntime,
-            permissionMode || codexApproval || xaiApproval
-          )
-        ) {
-          payload.confirm_beta_provider_permission_mode = true;
-        }
         validateTelegramEnabledPayloadOrThrow(
           payload,
           getCreateTelegramConfiguredState()
@@ -66143,8 +66097,6 @@ Waiting for Claude login output…</pre
       window.removeHostVoiceInputSavedToken = removeHostVoiceInputSavedToken;
       window.testHostVoiceInput = testHostVoiceInput;
       window.generateDirectHostLoginQr = generateDirectHostLoginQr;
-      window.copyHostPreferencesDirectHostUrl =
-        copyHostPreferencesDirectHostUrl;
       window.copyHostPreferencesLocalUrl = copyHostPreferencesLocalUrl;
       window.restartHostFromPreferences = restartHostFromPreferences;
       window.restorePreviousSessions = restorePreviousSessions;