oysterun 1.6.0-beta.13 → 1.6.0-beta.15

package/dev/client/web/index.html

@@ -2906,18 +2906,6 @@
         overflow-wrap: anywhere;
       }
 
-      .session-loop-recovery-actions {
-        display: flex;
-        flex: 1 0 100%;
-        flex-wrap: wrap;
-        gap: 8px;
-      }
-
-      .session-loop-recovery-action {
-        min-height: 44px;
-        white-space: normal;
-      }
-
       .session-loop-form-row {
         display: grid;
         grid-template-columns: repeat(3, minmax(0, 1fr));
@@ -3005,10 +2993,6 @@
         .scheduler-row.session-loop-row .scheduler-row-toggle {
           order: 3;
         }
-
-        .session-loop-recovery-actions > button {
-          flex: 1 1 100%;
-        }
       }
 
       .scheduler-panel {
@@ -8139,13 +8123,18 @@
         try {
           window.localStorage?.setItem("oysterun_token", token);
           const plugin = window.Capacitor?.Plugins?.OysterunDashboardAuth;
-          if (plugin && typeof plugin.save === "function") {
+          if (
+            params.get("oysterun_auth_restore") !== "1" &&
+            plugin &&
+            typeof plugin.save === "function"
+          ) {
             void plugin
               .save({ origin: window.location.origin, token })
               .catch(() => {});
           }
           params.delete("oysterun_token");
           params.delete("oysterun_bootstrap");
+          params.delete("oysterun_auth_restore");
           const nextHash = params.toString() ? `#${params.toString()}` : "";
           window.history.replaceState(
             null,
@@ -9502,6 +9491,7 @@
 
                     <div
                       id="create-error"
+                      role="alert"
                       class="error-box hidden settings-order-actions"
                     ></div>
                     <div class="toolbar setup-actions settings-order-actions">
@@ -29088,6 +29078,66 @@ Waiting for Claude login output…</pre
           : "ready";
       }
 
+      function renderHostProviderModelRefreshStatus(providerId) {
+        const el = $(`host-${providerId}-model-refresh-status`);
+        if (!el) return;
+        const status = providerCatalogState.providers.find(
+          (entry) => entry.id === providerId
+        )?.modelCatalogStatus;
+        if (!status) return;
+        const formatTime = (value, timeZone) =>
+          value
+            ? new Date(value).toLocaleString(
+                undefined,
+                timeZone ? { timeZone } : undefined
+              )
+            : "Not yet";
+        const source =
+          status.last_attempt_source === "background"
+            ? "Background"
+            : status.last_attempt_source
+            ? "Manual"
+            : "";
+        const lines = [
+          `Last successful refresh: ${formatTime(status.last_success_at)}`,
+          status.last_attempt_at
+            ? `Latest attempt: ${source} ${
+                status.last_attempt_status || "unknown"
+              } · ${formatTime(status.last_attempt_at)}`
+            : "No refresh attempt recorded.",
+        ];
+        if (status.last_attempt_reason)
+          lines.push(
+            `Reason: ${
+              status.last_attempt_reason === "provider_unavailable"
+                ? "Provider command is unavailable."
+                : status.last_attempt_reason
+            }`
+          );
+        if (status.using_previous_catalog)
+          lines.push("Still using the previous model list.");
+        lines.push(
+          status.next_refresh_at
+            ? `Next background refresh: ${formatTime(
+                status.next_refresh_at,
+                status.refresh_time_zone
+              )} (Host time${
+                status.refresh_time_zone ? ` · ${status.refresh_time_zone}` : ""
+              })`
+            : "Next background refresh: not scheduled."
+        );
+        const transient = getProviderModelRefreshState(providerId);
+        if (
+          transient.error &&
+          !status.last_attempt_reason?.includes(transient.error)
+        )
+          lines.push(transient.error);
+        if (transient.refreshing) lines.push("Refreshing models…");
+        el.textContent = lines.join("\n");
+        el.style.whiteSpace = "pre-line";
+        el.style.overflowWrap = "anywhere";
+      }
+
       function renderProviderModelRefreshControls() {
         const createProviderId = getEffectiveCreateRuntime(createRuntime);
         renderProviderModelRefreshControlInstance({
@@ -29106,6 +29156,7 @@ Waiting for Claude login output…</pre
             statusEl: $(`host-${providerId}-model-refresh-status`),
             disabled: hostDisabled,
           });
+          renderHostProviderModelRefreshStatus(providerId);
         }
       }
 
@@ -34788,6 +34839,14 @@ Waiting for Claude login output…</pre
         if (operation.running === true) {
           return operation.phase || "Installing...";
         }
+        if (
+          ["update_complete", "rolled_back", "restart_complete"].includes(
+            operation.status
+          ) &&
+          operation.user_path_verification
+        ) {
+          return operation.phase;
+        }
         if (operation.status === "update_complete") {
           return operation.final_observed_version
             ? `Oysterun updated to ${operation.final_observed_version}.`
@@ -35042,6 +35101,12 @@ Waiting for Claude login output…</pre
       }
 
       function isConfirmedDashboardAuthRejection(err) {
+        if (
+          isOysterunCapacitorIOSRuntime() &&
+          getOysterunDashboardAuthPlugin()
+        ) {
+          return err?.confirmedDashboardTokenRejection === true;
+        }
         const status = Number(err?.status || 0);
         if (status === 401 || status === 403) return true;
         const message = String(err?.message || "").trim();
@@ -35138,6 +35203,13 @@ Waiting for Claude login output…</pre
           const err = new Error(data.error || `HTTP ${resp.status}`);
           err.status = resp.status;
           err.data = data;
+          err.confirmedDashboardTokenRejection =
+            method === "GET" &&
+            path === "/dev/preferences" &&
+            Boolean(authToken) &&
+            authToken === syncTokenFromStorage() &&
+            (resp.status === 401 || resp.status === 403) &&
+            data.error === "Authentication required";
           throw err;
         }
         return data;
@@ -35172,6 +35244,13 @@ Waiting for Claude login output…</pre
           const err = new Error(data.error || `HTTP ${resp.status}`);
           err.status = resp.status;
           err.data = data;
+          err.confirmedDashboardTokenRejection =
+            method === "GET" &&
+            path === "/dev/preferences" &&
+            Boolean(authToken) &&
+            authToken === syncTokenFromStorage() &&
+            (resp.status === 401 || resp.status === 403) &&
+            data.error === "Authentication required";
           throw err;
         }
         return resp;
@@ -40947,6 +41026,29 @@ Waiting for Claude login output…</pre
         return "capacitor://localhost/index.html?logged_out=1";
       }
 
+      let dashboardNativeRecoveryPending = false;
+      function redirectToOysterunCapacitorBootstrapForRecovery() {
+        if (
+          !isOysterunCapacitorIOSRuntime() ||
+          !getOysterunDashboardAuthPlugin()
+        )
+          return false;
+        if (dashboardNativeRecoveryPending) return true;
+        dashboardNativeRecoveryPending = true;
+        const recoveryUrl = new URL("capacitor://localhost/index.html");
+        recoveryUrl.searchParams.set(
+          "auth_recovery",
+          "local_browser_token_missing"
+        );
+        recoveryUrl.searchParams.set("host_origin", window.location.origin);
+        const route = window.location.pathname + window.location.search;
+        if (/^\/app(?:\/|\?|$)/.test(route))
+          recoveryUrl.searchParams.set("return_route", route);
+        showAuthCheckingState("Opening Oysterun...");
+        window.location.replace(recoveryUrl.toString());
+        return true;
+      }
+
       function resetDashboardRuntimeStateForLogout() {
         clearHostRestartTransientState();
         token = null;
@@ -41659,7 +41761,7 @@ Waiting for Claude login output…</pre
 
       function shouldAbortAppBootForLoggedOutState() {
         if (syncTokenFromStorage()) return false;
-        if (redirectToOysterunCapacitorBootstrapAfterLogout()) return true;
+        if (redirectToOysterunCapacitorBootstrapForRecovery()) return true;
         showRealLoginFormState();
         setLoginBusy(false);
         startLoginAuthRecoveryLoop();
@@ -41801,6 +41903,11 @@ Waiting for Claude login output…</pre
       }
 
       async function handleStoredTokenBootFailure(err, opts = {}) {
+        if (
+          !syncTokenFromStorage() &&
+          redirectToOysterunCapacitorBootstrapForRecovery()
+        )
+          return;
         const classification = classifyDashboardAuthNetworkError(err);
         if (classification.state === DASHBOARD_AUTH_STATE.UNAUTHENTICATED) {
           token = null;
@@ -41924,6 +42031,7 @@ Waiting for Claude login output…</pre
         }
         if (!hadAuthToken) {
           if (!opts.notice && opts.noticeIsError !== true && !opts.route) {
+            if (redirectToOysterunCapacitorBootstrapAfterLogout()) return;
             return;
           }
           if (
@@ -43260,6 +43368,23 @@ Waiting for Claude login output…</pre
             "",
           runtime: liveSession.provider || liveSession.runtime || null,
           model: liveSession.model || null,
+          // Only editable setup values cross this boundary. Native/thread,
+          // Matrix, transcript and execution identity remain on the source.
+          setupConfig: {
+            provider: liveSession.provider || liveSession.runtime || null,
+            model: liveSession.model || null,
+            reasoningEffort: liveSession.reasoningEffort || null,
+            permissionMode: liveSession.permissionMode || null,
+            approvalPolicy: liveSession.approvalPolicy || null,
+            sharedAllowedPaths: getAgentProfileWorkspaceAllowedPathValues(
+              liveSession.workspacePolicy
+            ),
+            notifications: {
+              notifications_enabled:
+                liveSession.notificationSettings?.notifications_enabled !==
+                false,
+            },
+          },
           created_at: liveSession.startedAt || liveSession.started_at || null,
           last_active_at:
             liveSession.lastActiveAt || liveSession.last_active_at || null,
@@ -51982,14 +52107,19 @@ Waiting for Claude login output…</pre
           setVisible("resume-context-note", true);
           setResumeFolderLock(true);
         } else {
-          setText("config-panel-mode", "Prefilled from history");
+          setText(
+            "config-panel-mode",
+            opts.liveSetup ? "Duplicate Setup" : "Prefilled from history"
+          );
           setText(
             "config-panel-title",
             `Open ${getHistorySessionDisplayName(record)}`
           );
           setText(
             "config-panel-subtitle",
-            "This fills Session Setup with the saved agent and folder. Runtime settings come from the current config layers for that folder."
+            opts.liveSetup
+              ? "Review or edit the current session settings. A new session starts only when you press Start."
+              : "This fills Session Setup with the saved agent and folder. Runtime settings come from the current config layers for that folder."
           );
           setVisible("resume-context-note", false);
           setResumeFolderLock(false);
@@ -52004,7 +52134,12 @@ Waiting for Claude login output…</pre
             : null;
           await loadFolderConfigIntoCreateForm(record.agent_folder, {
             fillAgentIdIfEmpty: false,
-            providerOverride: opts.resume ? pendingResumeSourceRuntime : null,
+            providerOverride: opts.liveSetup
+              ? record.runtime
+              : opts.resume
+              ? pendingResumeSourceRuntime
+              : null,
+            setupConfig: opts.liveSetup ? record.setupConfig : null,
             modelOverride:
               resumeDisposition?.resume_identity_kind === "host_session"
                 ? sanitizeRouteText(record.model)
@@ -52028,6 +52163,47 @@ Waiting for Claude login output…</pre
         let record = sessionHistory.find(
           (entry) => entry.session_id === sessionId
         );
+        if (opts.resume !== true && getLiveSession(sessionId)) {
+          // A Running row owns Duplicate Setup even if History has an older
+          // copy. Collection rows are compact, so hydrate current settings.
+          try {
+            const payload = await apiWithAuthRetry(
+              "GET",
+              `/session/status?session_id=${encodeURIComponent(sessionId)}`
+            );
+            const route = getCurrentRoute();
+            if (
+              route.screen !== "session-setup" ||
+              route.sourceSessionId !== sessionId
+            )
+              return;
+            if (payload?.session_id !== sessionId || payload.alive !== true) {
+              throw new Error(
+                "The source session is no longer running. Return to Sessions and choose a source again."
+              );
+            }
+            syncLiveSessionFromStatusPayload(payload);
+            record = historyRecordFromLiveSession(getLiveSession(sessionId));
+            opts = { ...opts, liveSetup: true };
+          } catch (err) {
+            const route = getCurrentRoute();
+            if (
+              route.screen !== "session-setup" ||
+              route.sourceSessionId !== sessionId
+            )
+              return;
+            clearPendingResume();
+            showError(
+              "create-error",
+              `Could not load current session settings: ${err.message}`
+            );
+            showBanner(
+              `Could not load current session settings: ${err.message}`,
+              true
+            );
+            return;
+          }
+        }
         if (!record && opts.resume === true && opts.branch === true) {
           record = historyRecordFromLiveSession(getLiveSession(sessionId));
           if (record) {
@@ -52038,11 +52214,10 @@ Waiting for Claude login output…</pre
           }
         }
         if (!record) {
-          showBanner(
-            `Saved session ${sessionId} was not found in local history.`,
-            true
-          );
-          await navigateToRoute(buildSessionsRoute(), { replaceHistory: true });
+          clearPendingResume();
+          const message = `Session ${sessionId} is no longer available. Return to Sessions and choose another source.`;
+          showError("create-error", message);
+          showBanner(message, true);
           return;
         }
         let resumeUnavailableNotice = "";
@@ -53278,37 +53453,12 @@ Waiting for Claude login output…</pre
         const intervalLabel = row.interval_token
           ? formatSessionLoopIntervalToken(row.interval_token)
           : "--";
-        const incident = row.active_incident || null;
         const reasonLabel =
           row.suspension_reason === "checking_definition_availability"
             ? "Checking the shared Loop definition. Enabled intent is preserved."
             : row.suspension_reason === "definition_unavailable_confirmed"
             ? "Definition unavailable. This Loop is suspended without changing enabled intent."
-            : row.suspension_reason === "definition_changed_requires_review"
-            ? "Definition changed. Review it before Oysterun runs the updated command."
-            : row.suspension_reason === "legacy_reconciliation_intent_loss"
-            ? "A previous reconciliation may have stranded this Loop. Choose whether to restore it."
             : "";
-        const recoveryButtons = incident
-          ? (row.recovery_options || [])
-              .filter((option) => option !== "open_loop")
-              .map((option) => {
-                const label =
-                  option === "use_updated_definition"
-                    ? "Use updated definition"
-                    : option === "restore_previous_enabled_state"
-                    ? "Restore previous enabled state"
-                    : option === "keep_disabled"
-                    ? "Keep disabled"
-                    : "Restore";
-                return `<button class="btn-ghost session-loop-recovery-action" type="button" data-loop-action="recover" data-loop-id="${esc(
-                  row.id
-                )}" data-loop-recovery-action="${esc(option)}">${esc(
-                  label
-                )}</button>`;
-              })
-              .join("")
-          : "";
         return `
           <article
               class="scheduler-row session-loop-row"
@@ -53351,15 +53501,6 @@ Waiting for Claude login output…</pre
                     )}">${esc(reasonLabel)}</div>`
                   : ""
               }
-              ${
-                incident
-                  ? `<div class="session-loop-recovery-actions" data-oysterun-session-loop-incident="${esc(
-                      incident.id
-                    )}">${recoveryButtons}<button class="btn-ghost session-loop-recovery-action" type="button" data-loop-action="copy-diagnostic" data-loop-id="${esc(
-                      row.id
-                    )}">Copy diagnostic</button></div>`
-                  : ""
-              }
             </div>
             <button
               class="scheduler-row-menu-button"
@@ -53634,48 +53775,6 @@ Waiting for Claude login output…</pre
         }
       }
 
-      async function resolveSessionLoopIncident(scheduleId, action) {
-        const liveSession = getSelectedLiveSession();
-        if (!liveSession) return;
-        try {
-          await api(
-            "POST",
-            `/session/loops/${encodeURIComponent(scheduleId)}/recovery`,
-            { session_id: liveSession.sessionId, action }
-          );
-          await loadSessionLoopSchedules(liveSession.sessionId, {
-            force: true,
-          });
-          showBanner("Loop recovery choice saved.");
-        } catch (err) {
-          sessionLoopState = {
-            ...sessionLoopState,
-            error: err.message || String(err),
-          };
-          renderSessionLoopSection(liveSession);
-        }
-      }
-
-      async function copySessionLoopDiagnostic(scheduleId) {
-        const row = findSessionLoopRow(scheduleId);
-        if (!row) return;
-        const diagnostic = JSON.stringify(
-          {
-            loop_id: row.id,
-            status: row.status,
-            suspension_reason: row.suspension_reason,
-            definition_generation: row.definition_generation,
-            definition_revision: row.definition_revision,
-            candidate_definition_revision: row.candidate_definition_revision,
-            incident_id: row.active_incident?.id || null,
-          },
-          null,
-          2
-        );
-        await navigator.clipboard.writeText(diagnostic);
-        showBanner("Loop diagnostic copied.");
-      }
-
       async function deleteSessionLoop(scheduleId) {
         const liveSession = getSelectedLiveSession();
         if (!liveSession) return;
@@ -53761,17 +53860,6 @@ Waiting for Claude login output…</pre
           }
           return true;
         }
-        if (action === "recover") {
-          void resolveSessionLoopIncident(
-            scheduleId,
-            button.getAttribute("data-loop-recovery-action") || ""
-          );
-          return true;
-        }
-        if (action === "copy-diagnostic") {
-          void copySessionLoopDiagnostic(scheduleId);
-          return true;
-        }
         return false;
       }
 
@@ -64623,12 +64711,15 @@ Waiting for Claude login output…</pre
           const providerQuery = opts.providerOverride
             ? `&provider=${encodeURIComponent(opts.providerOverride)}`
             : "";
-          const data = await api(
+          const folderConfig = await api(
             "GET",
             `/dev/folder-config?path=${encodeURIComponent(
               folderPath
             )}${providerQuery}`
           );
+          const data = opts.setupConfig
+            ? { ...folderConfig, ...opts.setupConfig }
+            : folderConfig;
           const resolvedFolderPath = data.agent_folder || folderPath;
           const currentFolderPath = String(
             $("create-agent-folder").value || ""
@@ -64748,6 +64839,39 @@ Waiting for Claude login output…</pre
                   preserveSelection: true,
                 });
                 $("create-model").value = model;
+                if (opts.setupConfig) {
+                  // Preserve explicit live choices even if catalog/defaults
+                  // have changed; use the existing editable snapshot controls.
+                  applySelectValueFromSnapshot(
+                    $("create-model"),
+                    data.model,
+                    getNormalizedProviderModelSelection(
+                      provider,
+                      data.model,
+                      model
+                    ).options,
+                    (value) => getProviderModelLabel(provider, value)
+                  );
+                  applySelectValueFromSnapshot(
+                    getCreateReasoningEffortSelect(provider),
+                    data.reasoningEffort,
+                    getNormalizedProviderReasoningEffortSelection(
+                      provider,
+                      data.model,
+                      data.reasoningEffort,
+                      reasoningEffort
+                    ).options
+                  );
+                  const policy =
+                    getCreateOysterunPermissionPolicyKind(provider) ===
+                    "permission_mode"
+                      ? data.permissionMode
+                      : data.approvalPolicy;
+                  applySelectValueFromSnapshot(
+                    getCreateOysterunPermissionPolicyControl(provider),
+                    policy
+                  );
+                }
               }
             }
           }
@@ -65658,7 +65782,7 @@ Waiting for Claude login output…</pre
             void maybeAutoRegisterOysterunIOSPush();
           },
         });
-      } else if (!redirectToOysterunCapacitorBootstrapAfterLogout()) {
+      } else if (!redirectToOysterunCapacitorBootstrapForRecovery()) {
         resetCreateForm();
         renderPendingAttachments();
         updateComposerAvailability();

package/dev/client/web-chat/dist/assets/{ReactPrism-B8NIa4fv.js → ReactPrism-B3KTEOXB.js}

@@ -1,4 +1,4 @@
-import{g as ee,c as Y,r as K,j as Z}from"./index-BlWA-FTm.js";var X={exports:{}};(function(e){var t=typeof window<"u"?window:typeof WorkerGlobalScope<"u"&&self instanceof WorkerGlobalScope?self:{};/**
+import{g as ee,c as Y,r as K,j as Z}from"./index-BKVXuim6.js";var X={exports:{}};(function(e){var t=typeof window<"u"?window:typeof WorkerGlobalScope<"u"&&self instanceof WorkerGlobalScope?self:{};/**
 * Prism: Lightweight, robust, elegant syntax highlighting
 *
 * @license MIT <https://opensource.org/licenses/MIT>