herdr-remote 0.2.2 → 0.2.3

package/dist/tui.mjs

@@ -3132,16 +3132,21 @@ function RelayScreen({ ctx }) {
     { id: "regenerate", kind: "action", label: t("relay.regenerate") }
   ];
   const addresses = useMemo2(() => listReachableAddresses({ includeLoopback: false }), []);
-  const applyField = (id, value) => {
-    const result = (0, import_settings_model.setField)(draft, id, value);
-    if (result.errorKey) {
-      ctx.notify(t(result.errorKey), "error");
-      return false;
+  const applyFields = (updates) => {
+    let next = draft;
+    for (const [id, value] of updates) {
+      const result = (0, import_settings_model.setField)(next, id, value);
+      if (result.errorKey) {
+        ctx.notify(t(result.errorKey), "error");
+        return false;
+      }
+      next = result.draft;
     }
-    ctx.updateDraft(result.draft);
+    ctx.updateDraft(next);
     ctx.notify("", "info");
     return true;
   };
+  const applyField = (id, value) => applyFields([[id, value]]);
   const save = () => {
     try {
       const result = (0, import_settings_model.saveDraft)(draft);
@@ -3212,7 +3217,7 @@ function RelayScreen({ ctx }) {
         current: draft.relay.mode === "remote" && draft.relay.remoteUrl === import_config.OFFICIAL_RELAY_URL ? "official" : draft.relay.mode,
         onPick: (choice) => {
           if (choice === "official") {
-            if (applyField("mode", "remote")) applyField("remoteUrl", import_config.OFFICIAL_RELAY_URL);
+            applyFields([["mode", "remote"], ["remoteUrl", import_config.OFFICIAL_RELAY_URL]]);
             ctx.setEditing(null);
             return;
           }
@@ -3712,7 +3717,7 @@ function About({ ctx }) {
         children: updateLabel
       }
     ) }),
-    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.2" }) }),
+    /* @__PURE__ */ jsx10(Row, { label: t("about.version"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: "0.2.3" }) }),
     /* @__PURE__ */ jsx10(Row, { label: t("about.configPath"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: (0, import_config.configPath)() }) }),
     /* @__PURE__ */ jsx10(Row, { label: t("about.statePath"), children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: (0, import_config.stateDir)() }) }),
     /* @__PURE__ */ jsx10(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx10(Text9, { color: theme.muted, children: t("about.docs") }) }),
@@ -3724,10 +3729,10 @@ function About({ ctx }) {
 import { useMemo as useMemo3, useState as useState9 } from "react";
 import { Box as Box10, Text as Text10, useInput as useInput8 } from "ink";
 import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
-function stepsFor(mode) {
+function stepsFor(mode, remoteUrl) {
   const steps = ["language", "access"];
   if (mode === "lan") steps.push("address");
-  if (mode === "remote") steps.push("relayUrl", "password");
+  if (mode === "remote" && remoteUrl !== import_config.OFFICIAL_RELAY_URL) steps.push("relayUrl", "password");
   steps.push("finish");
   return steps;
 }
@@ -3742,18 +3747,26 @@ function Wizard({ ctx, onDone }) {
     () => listReachableAddresses({ includeLoopback: false }),
     []
   );
-  const steps = useMemo3(() => stepsFor(draft.relay.mode), [draft.relay.mode]);
+  const steps = useMemo3(
+    () => stepsFor(draft.relay.mode, draft.relay.remoteUrl),
+    [draft.relay.mode, draft.relay.remoteUrl]
+  );
   const stepIndex = Math.max(0, steps.indexOf(step));
-  const apply = (id, value) => {
-    const result = (0, import_settings_model.setField)(draft, id, value);
-    if (result.errorKey) {
-      ctx.notify(t(result.errorKey), "error");
-      return false;
+  const applyAll = (updates) => {
+    let next = draft;
+    for (const [id, value] of updates) {
+      const result = (0, import_settings_model.setField)(next, id, value);
+      if (result.errorKey) {
+        ctx.notify(t(result.errorKey), "error");
+        return false;
+      }
+      next = result.draft;
     }
-    ctx.updateDraft(result.draft);
+    ctx.updateDraft(next);
     ctx.notify("", "info");
     return true;
   };
+  const apply = (id, value) => applyAll([[id, value]]);
   const advance = (from, order = steps) => {
     const index = order.indexOf(from);
     setStep(order[Math.min(order.length - 1, index + 1)]);
@@ -3838,13 +3851,14 @@ function Wizard({ ctx, onDone }) {
           current: draft.relay.mode === "remote" && draft.relay.remoteUrl === import_config.OFFICIAL_RELAY_URL ? "official" : draft.relay.mode,
           onPick: (choice) => {
             if (choice === "official") {
-              if (!apply("mode", "remote")) return;
-              if (!apply("remoteUrl", import_config.OFFICIAL_RELAY_URL)) return;
+              if (!applyAll([["mode", "remote"], ["remoteUrl", import_config.OFFICIAL_RELAY_URL]])) return;
               (0, import_service.setRelayPassword)("");
-              advance("access", ["language", "access", "finish"]);
+              advance("access", stepsFor("remote", import_config.OFFICIAL_RELAY_URL));
               return;
             }
-            if (apply("mode", choice)) advance("access", stepsFor(choice));
+            if (apply("mode", choice)) {
+              advance("access", stepsFor(choice, draft.relay.remoteUrl));
+            }
           },
           onCancel: back
         }

package/herdr-plugin.toml

@@ -1,6 +1,6 @@
 id = "herdr.remote.web"
 name = "Herdr Remote Web"
-version = "0.2.2"
+version = "0.2.3"
 min_herdr_version = "0.8.2"
 description = "Mobile-first remote access to the native Herdr TUI through a local or self-hosted relay"
 platforms = ["linux", "macos"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Remote browser access to your Herdr terminal workspaces: Herdr plugin, host connector, and bilingual configuration TUI",
   "license": "MIT",
   "repository": {