@blue-soda/dsh-remote 0.5.4 → 0.5.6

package/README.md

@@ -23,7 +23,7 @@ Continue DeepSeek Harness sessions and experimental Codex workspaces from anothe
 Add the current package version to the `web` profile, then restart Harness:
 
 ```sh
-dsh plugin --profile web add -w @blue-soda/dsh-remote@0.5.4
+dsh plugin --profile web add -w @blue-soda/dsh-remote@0.5.6
 ```
 
 ### dsh-TUI Host
@@ -31,7 +31,7 @@ dsh plugin --profile web add -w @blue-soda/dsh-remote@0.5.4
 Remote can also run as a Host in a terminal-only [dsh-TUI](https://github.com/ccch1mneyyy/dsh-TUI) profile:
 
 ```sh
-dsh plugin --profile dsh-tui add -w @blue-soda/dsh-remote@0.5.4
+dsh plugin --profile dsh-tui add -w @blue-soda/dsh-remote@0.5.6
 ```
 
 After starting dsh-TUI, manage Remote with `/remote`, `/remote login`, `/remote status`, and `/remote logout`.

package/dist/client.github.js

@@ -1410,7 +1410,12 @@
         );
       }
       function RemoteWorkspaceAction(props) {
-        let { t } = props, [open, setOpen] = React.useState(!1), [status, setStatus] = React.useState(void 0), [devices, setDevices] = React.useState([]), [selectedHost, setSelectedHost] = React.useState(void 0), [connectingHost, setConnectingHost] = React.useState(void 0), [workspaces, setWorkspaces] = React.useState([]), [codexWorkspaces, setCodexWorkspaces] = React.useState([]), [codexNotice, setCodexNotice] = React.useState(void 0), [codexAvailable, setCodexAvailable] = React.useState(!1), codexProbeAvailable = React.useRef(!1), [codexOpen, setCodexOpen] = React.useState(!1), [workspaceBackend, setWorkspaceBackend] = React.useState("harness"), [codexWorkspaceId, setCodexWorkspaceId] = React.useState(void 0), [directory, setDirectory] = React.useState(void 0), [path, setPath] = React.useState(""), [addingWorkspace, setAddingWorkspace] = React.useState(!1), [showAllWorkspaces, setShowAllWorkspaces] = React.useState(!1), [showAllCodexWorkspaces, setShowAllCodexWorkspaces] = React.useState(!1), [devicesOpen, setDevicesOpen] = React.useState(!1), workspaceListId = "dsh-remote-workspace-list", codexWorkspaceHeadingId = "dsh-remote-codex-workspace-heading", codexWorkspaceListId = "dsh-remote-codex-workspace-list", [busy, setBusy] = React.useState(!1), [needsAuthorization, setNeedsAuthorization] = React.useState(!1), [authorizationResolved, setAuthorizationResolved] = React.useState(!1), [loginServerUrl, setLoginServerUrl] = React.useState(DEFAULT_REMOTE_SERVER_URL), [editingServerUrl, setEditingServerUrl] = React.useState(!1), [awaitingDeepSeek, setAwaitingDeepSeek] = React.useState(!1), [pendingAuthorizeUrl, setPendingAuthorizeUrl] = React.useState(void 0), [loginMethod] = React.useState(
+        let { t } = props, [open, setOpen] = React.useState(!1);
+        React.useEffect(() => {
+          open && props.control("settings.get").catch(() => {
+          });
+        }, [open]);
+        let [status, setStatus] = React.useState(void 0), [devices, setDevices] = React.useState([]), [selectedHost, setSelectedHost] = React.useState(void 0), [connectingHost, setConnectingHost] = React.useState(void 0), [workspaces, setWorkspaces] = React.useState([]), [codexWorkspaces, setCodexWorkspaces] = React.useState([]), [codexNotice, setCodexNotice] = React.useState(void 0), [codexAvailable, setCodexAvailable] = React.useState(!1), codexProbeAvailable = React.useRef(!1), [codexOpen, setCodexOpen] = React.useState(!1), [workspaceBackend, setWorkspaceBackend] = React.useState("harness"), [codexWorkspaceId, setCodexWorkspaceId] = React.useState(void 0), [directory, setDirectory] = React.useState(void 0), [path, setPath] = React.useState(""), [addingWorkspace, setAddingWorkspace] = React.useState(!1), [showAllWorkspaces, setShowAllWorkspaces] = React.useState(!1), [showAllCodexWorkspaces, setShowAllCodexWorkspaces] = React.useState(!1), [devicesOpen, setDevicesOpen] = React.useState(!1), workspaceListId = "dsh-remote-workspace-list", codexWorkspaceHeadingId = "dsh-remote-codex-workspace-heading", codexWorkspaceListId = "dsh-remote-codex-workspace-list", [busy, setBusy] = React.useState(!1), [needsAuthorization, setNeedsAuthorization] = React.useState(!1), authorizedOnce = React.useRef(!1), [authorizationResolved, setAuthorizationResolved] = React.useState(!1), [loginServerUrl, setLoginServerUrl] = React.useState(DEFAULT_REMOTE_SERVER_URL), [editingServerUrl, setEditingServerUrl] = React.useState(!1), [awaitingDeepSeek, setAwaitingDeepSeek] = React.useState(!1), [pendingAuthorizeUrl, setPendingAuthorizeUrl] = React.useState(void 0), [loginMethod] = React.useState(
           isEnabledQrProvider(props.preferredQrProvider) ? props.preferredQrProvider : defaultQrProvider
         ), [qrSession, setQrSession] = React.useState(void 0), [qrExpired, setQrExpired] = React.useState(!1), [progress, setProgress] = React.useState(void 0), progressRun = React.useRef(0), qrFlowRun = React.useRef(0), [notice, setNotice] = React.useState(void 0), [confirmingSignOut, setConfirmingSignOut] = React.useState(!1), [confirmingRevoke, setConfirmingRevoke] = React.useState(!1), [error, setError] = React.useState(void 0);
         React.useEffect(() => {
@@ -1476,7 +1481,7 @@
             polling || settled || (polling = !0, props.control("client.account.qr.poll", { qrId: qrSession.qrId }).then(async (result) => {
               if (!(!active || settled || run !== qrFlowRun.current))
                 if (result.status === "complete") {
-                  settled = !0, timer !== void 0 && window.clearInterval(timer), setBusy(!0), setError(void 0), setQrExpired(!1), setNeedsAuthorization(!1);
+                  settled = !0, timer !== void 0 && window.clearInterval(timer), setBusy(!0), setError(void 0), setQrExpired(!1), authorizedOnce.current = !0, setNeedsAuthorization(!1);
                   try {
                     let [nextDevices, nextStatus] = await Promise.all([
                       props.control("devices"),
@@ -1575,25 +1580,25 @@
           try {
             let nextStatus = await props.control("status");
             if (setStatus(nextStatus), !nextStatus.available) {
-              setDevices([]), setNeedsAuthorization(!1), setAuthorizationResolved(!0), setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0);
+              setDevices([]), authorizedOnce.current = !0, setNeedsAuthorization(!1), setAuthorizationResolved(!0), setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0);
               return;
             }
             let storedLocally;
             try {
               storedLocally = (await props.control("authorization.local"))?.stored === !0, setNeedsAuthorization(!storedLocally);
             } catch {
-              setNeedsAuthorization(!1);
+              authorizedOnce.current = !0, setNeedsAuthorization(!1);
             } finally {
               setAuthorizationResolved(!0);
             }
             try {
               let nextDevices = await props.control("devices");
-              if (setDevices(nextDevices), storedLocally !== void 0 && setNeedsAuthorization(authorizationStillNeeded(storedLocally, nextDevices.length)), selectedHost !== void 0) {
+              if (setDevices(nextDevices), !authorizedOnce.current && storedLocally !== void 0 && setNeedsAuthorization(authorizationStillNeeded(storedLocally, nextDevices.length)), selectedHost !== void 0) {
                 let nextSelectedHost = nextDevices.find((device) => device.deviceId === selectedHost.deviceId);
                 nextSelectedHost === void 0 ? (setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0)) : setSelectedHost(nextSelectedHost);
               }
             } catch {
-              setDevices([]), setNeedsAuthorization(!0), setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0);
+              setDevices([]), authorizedOnce.current = !1, setNeedsAuthorization(!0), setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0);
             }
             selectedHost !== void 0 && (await props.control("remote.session.recover").then((next) => setStatus(next)).catch(() => {
             }), await Promise.all([loadHarnessWorkspaces(selectedHost), loadCodexWorkspaces(selectedHost)]));
@@ -1604,6 +1609,17 @@
           }
         }, show = async () => {
           setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setOpen(!0), await refreshRemote();
+          for (let attempt = 0; attempt < 10; attempt++) {
+            let list = await props.control("devices").catch(() => {
+            });
+            if (list !== void 0) {
+              setDevices(list), authorizedOnce.current = !0, setNeedsAuthorization(!1), setAuthorizationResolved(!0), await refreshRemote();
+              return;
+            }
+            await new Promise((resolve) => {
+              setTimeout(resolve, 1e3);
+            });
+          }
         };
         React.useEffect(() => {
           if (!(!open || selectedHost !== void 0))
@@ -1629,7 +1645,22 @@
         }, [open, selectedHost]);
         let chooseAnotherHost = () => {
           setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setCodexNotice(void 0), setCodexAvailable(!1), codexProbeAvailable.current = !1, setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setDirectory(void 0), setPath(""), setAddingWorkspace(!1), setError(void 0);
-        }, requestDeepSeekSignIn = async () => {
+        }, signingIn = busy || status?.authorizing === !0 || needsAuthorization && status?.hasDeepSeekSession === !0;
+        React.useEffect(() => {
+          if (!signingIn) return;
+          let tries = 0, timer = window.setInterval(() => {
+            tries += 1, (async () => {
+              let next = await props.control("status").catch(() => {
+              });
+              next !== void 0 && setStatus(next);
+              let list = await props.control("devices").catch(() => {
+              });
+              list !== void 0 && (setDevices(list), authorizedOnce.current = !0, setNeedsAuthorization(!1), setAuthorizationResolved(!0));
+            })(), tries >= 5 && window.clearInterval(timer);
+          }, 1e3);
+          return () => window.clearInterval(timer);
+        }, [signingIn]);
+        let requestDeepSeekSignIn = async () => {
           let transport = globalThis.__DSH_TRANSPORT__, callbackOrigin = transport?.streamBaseUrl !== void 0 ? new URL(transport.streamBaseUrl).origin : window.location.origin, result = await props.control("settings.configure", {
             // No `role`: a device has one identity, and the control writes only the Server address plus this
             // sign-in. Sending a role here was the last thing that made one look like a runtime switch.
@@ -1667,7 +1698,7 @@
               if (state.pending) throw new Error(t("deepseekSignInTimeout"));
             } else
               tab?.close();
-            setDevices(await props.control("devices")), setStatus(await props.control("status")), setNeedsAuthorization(!1), setAuthorizationResolved(!0), setNotice(void 0);
+            setDevices(await props.control("devices")), setStatus(await props.control("status")), authorizedOnce.current = !0, setNeedsAuthorization(!1), setAuthorizationResolved(!0), setNotice(void 0);
           } catch (reason) {
             setError(remoteErrorMessage(reason, t));
           } finally {
@@ -1692,7 +1723,7 @@
         }, revokeRemote = async () => {
           setBusy(!0), setError(void 0), setNotice(void 0);
           try {
-            await props.control("client.device.revoke"), setDevices([]), setNeedsAuthorization(!0), setStatus(await props.control("status"));
+            await props.control("client.device.revoke"), setDevices([]), authorizedOnce.current = !1, setNeedsAuthorization(!0), setStatus(await props.control("status"));
           } catch (reason) {
             setError(remoteErrorMessage(reason, t));
           } finally {
@@ -1701,7 +1732,7 @@
         }, logoutRemote = async () => {
           setBusy(!0), setError(void 0), setNotice(void 0);
           try {
-            await props.control("settings.logout"), setDevices([]), setNeedsAuthorization(!0), setQrSession(void 0), setQrExpired(!1), setStatus(await props.control("status"));
+            await props.control("settings.logout"), setDevices([]), authorizedOnce.current = !1, setNeedsAuthorization(!0), setQrSession(void 0), setQrExpired(!1), setStatus(await props.control("status"));
           } catch (reason) {
             setError(remoteErrorMessage(reason, t));
           } finally {
@@ -1909,11 +1940,11 @@
                         onClick: () => setEditingServerUrl(!0)
                       }, loginServerUrl)
                     ),
-                    React.createElement(
-                      "button",
-                      { type: "button", disabled: busy || loginServerUrl.trim() === "", onClick: () => void signInClient() },
-                      t(busy ? "signingIn" : "deepseekSignIn")
-                    ),
+                    React.createElement("button", {
+                      type: "button",
+                      disabled: busy || signingIn || loginServerUrl.trim() === "",
+                      onClick: () => void signInClient()
+                    }, t(signingIn ? "signingIn" : "deepseekSignIn")),
                     awaitingDeepSeek ? React.createElement(
                       "p",
                       { className: "dshRemoteServiceAddress" },

package/dist/client.js

@@ -1410,7 +1410,12 @@
         );
       }
       function RemoteWorkspaceAction(props) {
-        let { t } = props, [open, setOpen] = React.useState(!1), [status, setStatus] = React.useState(void 0), [devices, setDevices] = React.useState([]), [selectedHost, setSelectedHost] = React.useState(void 0), [connectingHost, setConnectingHost] = React.useState(void 0), [workspaces, setWorkspaces] = React.useState([]), [codexWorkspaces, setCodexWorkspaces] = React.useState([]), [codexNotice, setCodexNotice] = React.useState(void 0), [codexAvailable, setCodexAvailable] = React.useState(!1), codexProbeAvailable = React.useRef(!1), [codexOpen, setCodexOpen] = React.useState(!1), [workspaceBackend, setWorkspaceBackend] = React.useState("harness"), [codexWorkspaceId, setCodexWorkspaceId] = React.useState(void 0), [directory, setDirectory] = React.useState(void 0), [path, setPath] = React.useState(""), [addingWorkspace, setAddingWorkspace] = React.useState(!1), [showAllWorkspaces, setShowAllWorkspaces] = React.useState(!1), [showAllCodexWorkspaces, setShowAllCodexWorkspaces] = React.useState(!1), [devicesOpen, setDevicesOpen] = React.useState(!1), workspaceListId = "dsh-remote-workspace-list", codexWorkspaceHeadingId = "dsh-remote-codex-workspace-heading", codexWorkspaceListId = "dsh-remote-codex-workspace-list", [busy, setBusy] = React.useState(!1), [needsAuthorization, setNeedsAuthorization] = React.useState(!1), [authorizationResolved, setAuthorizationResolved] = React.useState(!1), [loginServerUrl, setLoginServerUrl] = React.useState(DEFAULT_REMOTE_SERVER_URL), [editingServerUrl, setEditingServerUrl] = React.useState(!1), [awaitingDeepSeek, setAwaitingDeepSeek] = React.useState(!1), [pendingAuthorizeUrl, setPendingAuthorizeUrl] = React.useState(void 0), [loginMethod] = React.useState(
+        let { t } = props, [open, setOpen] = React.useState(!1);
+        React.useEffect(() => {
+          open && props.control("settings.get").catch(() => {
+          });
+        }, [open]);
+        let [status, setStatus] = React.useState(void 0), [devices, setDevices] = React.useState([]), [selectedHost, setSelectedHost] = React.useState(void 0), [connectingHost, setConnectingHost] = React.useState(void 0), [workspaces, setWorkspaces] = React.useState([]), [codexWorkspaces, setCodexWorkspaces] = React.useState([]), [codexNotice, setCodexNotice] = React.useState(void 0), [codexAvailable, setCodexAvailable] = React.useState(!1), codexProbeAvailable = React.useRef(!1), [codexOpen, setCodexOpen] = React.useState(!1), [workspaceBackend, setWorkspaceBackend] = React.useState("harness"), [codexWorkspaceId, setCodexWorkspaceId] = React.useState(void 0), [directory, setDirectory] = React.useState(void 0), [path, setPath] = React.useState(""), [addingWorkspace, setAddingWorkspace] = React.useState(!1), [showAllWorkspaces, setShowAllWorkspaces] = React.useState(!1), [showAllCodexWorkspaces, setShowAllCodexWorkspaces] = React.useState(!1), [devicesOpen, setDevicesOpen] = React.useState(!1), workspaceListId = "dsh-remote-workspace-list", codexWorkspaceHeadingId = "dsh-remote-codex-workspace-heading", codexWorkspaceListId = "dsh-remote-codex-workspace-list", [busy, setBusy] = React.useState(!1), [needsAuthorization, setNeedsAuthorization] = React.useState(!1), authorizedOnce = React.useRef(!1), [authorizationResolved, setAuthorizationResolved] = React.useState(!1), [loginServerUrl, setLoginServerUrl] = React.useState(DEFAULT_REMOTE_SERVER_URL), [editingServerUrl, setEditingServerUrl] = React.useState(!1), [awaitingDeepSeek, setAwaitingDeepSeek] = React.useState(!1), [pendingAuthorizeUrl, setPendingAuthorizeUrl] = React.useState(void 0), [loginMethod] = React.useState(
           isEnabledQrProvider(props.preferredQrProvider) ? props.preferredQrProvider : defaultQrProvider
         ), [qrSession, setQrSession] = React.useState(void 0), [qrExpired, setQrExpired] = React.useState(!1), [progress, setProgress] = React.useState(void 0), progressRun = React.useRef(0), qrFlowRun = React.useRef(0), [notice, setNotice] = React.useState(void 0), [confirmingSignOut, setConfirmingSignOut] = React.useState(!1), [confirmingRevoke, setConfirmingRevoke] = React.useState(!1), [error, setError] = React.useState(void 0);
         React.useEffect(() => {
@@ -1476,7 +1481,7 @@
             polling || settled || (polling = !0, props.control("client.account.qr.poll", { qrId: qrSession.qrId }).then(async (result) => {
               if (!(!active || settled || run !== qrFlowRun.current))
                 if (result.status === "complete") {
-                  settled = !0, timer !== void 0 && window.clearInterval(timer), setBusy(!0), setError(void 0), setQrExpired(!1), setNeedsAuthorization(!1);
+                  settled = !0, timer !== void 0 && window.clearInterval(timer), setBusy(!0), setError(void 0), setQrExpired(!1), authorizedOnce.current = !0, setNeedsAuthorization(!1);
                   try {
                     let [nextDevices, nextStatus] = await Promise.all([
                       props.control("devices"),
@@ -1575,25 +1580,25 @@
           try {
             let nextStatus = await props.control("status");
             if (setStatus(nextStatus), !nextStatus.available) {
-              setDevices([]), setNeedsAuthorization(!1), setAuthorizationResolved(!0), setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0);
+              setDevices([]), authorizedOnce.current = !0, setNeedsAuthorization(!1), setAuthorizationResolved(!0), setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0);
               return;
             }
             let storedLocally;
             try {
               storedLocally = (await props.control("authorization.local"))?.stored === !0, setNeedsAuthorization(!storedLocally);
             } catch {
-              setNeedsAuthorization(!1);
+              authorizedOnce.current = !0, setNeedsAuthorization(!1);
             } finally {
               setAuthorizationResolved(!0);
             }
             try {
               let nextDevices = await props.control("devices");
-              if (setDevices(nextDevices), storedLocally !== void 0 && setNeedsAuthorization(authorizationStillNeeded(storedLocally, nextDevices.length)), selectedHost !== void 0) {
+              if (setDevices(nextDevices), !authorizedOnce.current && storedLocally !== void 0 && setNeedsAuthorization(authorizationStillNeeded(storedLocally, nextDevices.length)), selectedHost !== void 0) {
                 let nextSelectedHost = nextDevices.find((device) => device.deviceId === selectedHost.deviceId);
                 nextSelectedHost === void 0 ? (setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0)) : setSelectedHost(nextSelectedHost);
               }
             } catch {
-              setDevices([]), setNeedsAuthorization(!0), setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0);
+              setDevices([]), authorizedOnce.current = !1, setNeedsAuthorization(!0), setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setPath(""), setAddingWorkspace(!1), setDirectory(void 0);
             }
             selectedHost !== void 0 && (await props.control("remote.session.recover").then((next) => setStatus(next)).catch(() => {
             }), await Promise.all([loadHarnessWorkspaces(selectedHost), loadCodexWorkspaces(selectedHost)]));
@@ -1604,6 +1609,17 @@
           }
         }, show = async () => {
           setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setOpen(!0), await refreshRemote();
+          for (let attempt = 0; attempt < 10; attempt++) {
+            let list = await props.control("devices").catch(() => {
+            });
+            if (list !== void 0) {
+              setDevices(list), authorizedOnce.current = !0, setNeedsAuthorization(!1), setAuthorizationResolved(!0), await refreshRemote();
+              return;
+            }
+            await new Promise((resolve) => {
+              setTimeout(resolve, 1e3);
+            });
+          }
         };
         React.useEffect(() => {
           if (!(!open || selectedHost !== void 0))
@@ -1629,7 +1645,22 @@
         }, [open, selectedHost]);
         let chooseAnotherHost = () => {
           setSelectedHost(void 0), setWorkspaces([]), setCodexWorkspaces([]), setCodexNotice(void 0), setCodexAvailable(!1), codexProbeAvailable.current = !1, setShowAllWorkspaces(!1), setShowAllCodexWorkspaces(!1), setWorkspaceBackend("harness"), setCodexWorkspaceId(void 0), setDirectory(void 0), setPath(""), setAddingWorkspace(!1), setError(void 0);
-        }, requestDeepSeekSignIn = async () => {
+        }, signingIn = busy || status?.authorizing === !0 || needsAuthorization && status?.hasDeepSeekSession === !0;
+        React.useEffect(() => {
+          if (!signingIn) return;
+          let tries = 0, timer = window.setInterval(() => {
+            tries += 1, (async () => {
+              let next = await props.control("status").catch(() => {
+              });
+              next !== void 0 && setStatus(next);
+              let list = await props.control("devices").catch(() => {
+              });
+              list !== void 0 && (setDevices(list), authorizedOnce.current = !0, setNeedsAuthorization(!1), setAuthorizationResolved(!0));
+            })(), tries >= 5 && window.clearInterval(timer);
+          }, 1e3);
+          return () => window.clearInterval(timer);
+        }, [signingIn]);
+        let requestDeepSeekSignIn = async () => {
           let transport = globalThis.__DSH_TRANSPORT__, callbackOrigin = transport?.streamBaseUrl !== void 0 ? new URL(transport.streamBaseUrl).origin : window.location.origin, result = await props.control("settings.configure", {
             // No `role`: a device has one identity, and the control writes only the Server address plus this
             // sign-in. Sending a role here was the last thing that made one look like a runtime switch.
@@ -1667,7 +1698,7 @@
               if (state.pending) throw new Error(t("deepseekSignInTimeout"));
             } else
               tab?.close();
-            setDevices(await props.control("devices")), setStatus(await props.control("status")), setNeedsAuthorization(!1), setAuthorizationResolved(!0), setNotice(void 0);
+            setDevices(await props.control("devices")), setStatus(await props.control("status")), authorizedOnce.current = !0, setNeedsAuthorization(!1), setAuthorizationResolved(!0), setNotice(void 0);
           } catch (reason) {
             setError(remoteErrorMessage(reason, t));
           } finally {
@@ -1692,7 +1723,7 @@
         }, revokeRemote = async () => {
           setBusy(!0), setError(void 0), setNotice(void 0);
           try {
-            await props.control("client.device.revoke"), setDevices([]), setNeedsAuthorization(!0), setStatus(await props.control("status"));
+            await props.control("client.device.revoke"), setDevices([]), authorizedOnce.current = !1, setNeedsAuthorization(!0), setStatus(await props.control("status"));
           } catch (reason) {
             setError(remoteErrorMessage(reason, t));
           } finally {
@@ -1701,7 +1732,7 @@
         }, logoutRemote = async () => {
           setBusy(!0), setError(void 0), setNotice(void 0);
           try {
-            await props.control("settings.logout"), setDevices([]), setNeedsAuthorization(!0), setQrSession(void 0), setQrExpired(!1), setStatus(await props.control("status"));
+            await props.control("settings.logout"), setDevices([]), authorizedOnce.current = !1, setNeedsAuthorization(!0), setQrSession(void 0), setQrExpired(!1), setStatus(await props.control("status"));
           } catch (reason) {
             setError(remoteErrorMessage(reason, t));
           } finally {
@@ -1909,11 +1940,11 @@
                         onClick: () => setEditingServerUrl(!0)
                       }, loginServerUrl)
                     ),
-                    React.createElement(
-                      "button",
-                      { type: "button", disabled: busy || loginServerUrl.trim() === "", onClick: () => void signInClient() },
-                      t(busy ? "signingIn" : "deepseekSignIn")
-                    ),
+                    React.createElement("button", {
+                      type: "button",
+                      disabled: busy || signingIn || loginServerUrl.trim() === "",
+                      onClick: () => void signInClient()
+                    }, t(signingIn ? "signingIn" : "deepseekSignIn")),
                     awaitingDeepSeek ? React.createElement(
                       "p",
                       { className: "dshRemoteServiceAddress" },

package/dist/index.js

@@ -13521,7 +13521,7 @@ function normalizeServerUrl(value) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = "0.5.4";
+var PLUGIN_VERSION = "0.5.6";
 
 // src/server-api.ts
 var ENABLED_QR_PROVIDERS = ["github"];
@@ -14109,7 +14109,7 @@ var HostServerConnection = class {
         if (TERMINAL_AUTH_ERRORS.has(code)) {
           this.logger.warn(code === "CONNECTION_REPLACED" ? "Another instance is using this Host identity. Standing by: retrying in five minutes, and taking over as soon as it leaves." : code === "SERVER_CREDENTIALS_BUSY" ? "Credential refresh is locked. Stop other instances; after a crash, stop all instances before removing server-credentials.json.refresh-lock and authorizing again." : "Host authorization failed. Run /remote login or authorize this Host again in Remote settings.");
         }
-        if (code === "DEVICE_REVOKED") {
+        if (code === "DEVICE_REVOKED" || code === "AUTH_INVALID") {
           try {
             await this.api.clearAuthorization();
           } catch (clearError) {
@@ -15512,7 +15512,7 @@ var CodexRemoteClient = class {
     if (!isRecord(result) || !Array.isArray(result.data))
       throw invalidResponse("thread list");
     return {
-      sessions: result.data.map(projectCodexThread).filter((value) => value !== void 0),
+      sessions: uniqueCodexThreadRows(result.data).map(projectCodexThread).filter((value) => value !== void 0),
       ...typeof result.nextCursor === "string" ? { nextCursor: result.nextCursor } : {}
     };
   }
@@ -15666,6 +15666,33 @@ function projectCodexThread(value) {
     ...typeof value.isPinned === "boolean" ? { pinned: value.isPinned } : {}
   };
 }
+var THREAD_ID_KEY = /^[A-Za-z0-9][A-Za-z0-9._-]{0,255}$/u;
+var LEGACY_ROW_KEY = /^([A-Za-z0-9][A-Za-z0-9._-]{0,255})~[^~]{0,64}~[0-9]{1,9}$/u;
+function codexThreadIdFromKey(key) {
+  if (THREAD_ID_KEY.test(key))
+    return key;
+  return LEGACY_ROW_KEY.exec(key)?.[1];
+}
+function rowFreshness(row) {
+  for (const field of ["updatedAt", "createdAt"]) {
+    const value = row[field];
+    if (typeof value === "number" && Number.isFinite(value))
+      return value;
+  }
+  return 0;
+}
+function uniqueCodexThreadRows(values) {
+  const byThread = /* @__PURE__ */ new Map();
+  for (const value of values) {
+    if (!isRecord(value) || typeof value.id !== "string" || value.id.length === 0)
+      continue;
+    const threadId = codexThreadIdFromKey(value.id) ?? value.id;
+    const current = byThread.get(threadId);
+    if (current === void 0 || rowFreshness(value) > rowFreshness(current))
+      byThread.set(threadId, value);
+  }
+  return [...byThread.values()];
+}
 function deriveCodexCwdWorkspaces(values) {
   const byPath = /* @__PURE__ */ new Map();
   const usedIds = /* @__PURE__ */ new Set();
@@ -17540,6 +17567,17 @@ function record(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
 
+// src/codex/session-id.ts
+var SESSION_PREFIX = "codex:";
+function parseCodexSessionId(value) {
+  if (typeof value !== "string" || !value.startsWith(SESSION_PREFIX)) return void 0;
+  const threadId = codexThreadIdFromKey(value.slice(SESSION_PREFIX.length));
+  return threadId === void 0 ? void 0 : { sessionId: value, threadId };
+}
+function resolveCodexThreadKey(key) {
+  return codexThreadIdFromKey(key) ?? key;
+}
+
 // src/codex/method-policy.ts
 var id2 = external_exports.string().min(1).max(256);
 var cursor = external_exports.string().min(1).max(4096).nullable().optional();
@@ -19411,7 +19449,7 @@ async function loadCatalog(client, signal, pendingThreads) {
       updatedAt: workspace.updatedAt
     }));
   }
-  const projected = threads.map((thread) => {
+  const projected = uniqueCodexThreadRows(threads).map((thread) => {
     const session = projectCodexThread(thread);
     return session === void 0 ? void 0 : { thread, session };
   }).filter((value) => value !== void 0);
@@ -20121,10 +20159,9 @@ function sessionIdFromAddress(address) {
   return requiredString(address.childSessionId, "childSessionId");
 }
 function nativeThreadId(sessionId) {
-  if (!sessionId.startsWith(CODEX_SESSION_PREFIX) || sessionId.length === CODEX_SESSION_PREFIX.length) {
-    throw new Error("The selected Session does not belong to CodeX.");
-  }
-  return sessionId.slice(CODEX_SESSION_PREFIX.length);
+  const parsed = parseCodexSessionId(sessionId);
+  if (parsed === void 0) throw new Error("The selected Session does not belong to CodeX.");
+  return parsed.threadId;
 }
 function activeTurnId(value) {
   if (!Array.isArray(value)) return void 0;
@@ -21920,10 +21957,16 @@ var ClientModeRuntime = class {
   registerControl(connection, webServer) {
     return registerControlRoute(connection, (endpoint, payload, signal) => this.handleControl(endpoint, payload, signal), webServer);
   }
+  /** True while the plugin is exchanging DSH's DeepSeek credential for this device's Server credentials. */
+  authorizingWithDeepSeek = false;
+  /** Whether DSH held a DeepSeek session at the last reconciliation. */
+  hasDeepSeekSession = false;
   status() {
     const targetStatus = this.gatewaySwitch.supportsCarrier() ? this.gatewaySwitch.status() : this.proxySwitch?.status() ?? this.gatewaySwitch.status();
     return {
       available: this.config.serverUrl !== void 0,
+      authorizing: this.authorizingWithDeepSeek,
+      hasDeepSeekSession: this.hasDeepSeekSession,
       identityReady: this.identity !== void 0,
       deviceId: this.identity?.deviceId,
       deviceName: this.identity?.name,
@@ -22086,6 +22129,11 @@ var ClientModeRuntime = class {
   reloadCredentials() {
     this.server.reloadCredentials();
   }
+  /** Whether this device holds Server credentials, i.e. the panel shows it as signed in. */
+  async hasServerAuthorization() {
+    if (this.server.hasStoredAuthorization === void 0) return false;
+    return await this.server.hasStoredAuthorization().catch(() => false);
+  }
   async setHostAuthorization(enabled) {
     if (this.host === void 0) throw new ClientModeError("METHOD_NOT_ALLOWED", "This plugin is not running as a Host.");
     if (!enabled) {
@@ -24668,8 +24716,9 @@ var CodexPeerBridge = class {
       method: "thread/read",
       params: { threadId: params.threadId, includeTurns: false }
     });
-    this.streams.set(params.streamId, params.threadId);
-    return { opened: true, streamId: params.streamId, threadId: params.threadId };
+    const threadId = resolveCodexThreadKey(params.threadId);
+    this.streams.set(params.streamId, threadId);
+    return { opened: true, streamId: params.streamId, threadId };
   }
   closeStream(input2) {
     const params = streamCloseSchema.parse(input2);
@@ -25014,12 +25063,19 @@ var CodexRemoteDomain = class {
         idempotencyKey: call.params.idempotencyKey
       }));
     }
+    if (isRecord12(call.params) && typeof call.params.threadId === "string") {
+      call.params.threadId = resolveCodexThreadKey(call.params.threadId);
+    }
     if (call.method === "thread/list") {
       const result = sanitizeThreadList(await this.callUpstream(call.method, call.params));
-      return filterThreadListByWorkspaceAuthority(
+      const authorized = filterThreadListByWorkspaceAuthority(
         result,
         await this.readWorkspaceAuthority(result.data)
       );
+      return {
+        ...authorized,
+        data: uniqueCodexThreadRows(authorized.data)
+      };
     }
     if (call.method === "thread/start") {
       const cwd = await this.requireCodexWorkspacePath(call.params.cwd);
@@ -26228,7 +26284,6 @@ var PluginControlRuntime = class {
    *
    * `undefined` means no sign-in is in flight, which is also the state after a completed authorization.
    */
-  deepSeekSignIn;
   register(connection, webServer) {
     const statusStream = new ControlStatusStream(() => this.streamStatus());
     return registerControlRoute(
@@ -26337,15 +26392,13 @@ var PluginControlRuntime = class {
         throw new ClientModeError("METHOD_NOT_ALLOWED", "DeepSeek account sign-in is unavailable in this profile.");
       }
       const session = await this.deepseekSession.read();
-      const counted = session !== void 0 && this.deepSeekSignIn !== void 0;
-      if (!counted) {
+      if (session === void 0) {
         const started = await this.deepseekSession.startSignIn({
           callbackOrigin: typeof value.callbackOrigin === "string" ? value.callbackOrigin : "",
           loginSource: value.loginSource === "desktop" ? "desktop" : "web",
           locale: typeof value.locale === "string" ? value.locale : "en",
           timezoneOffsetSeconds: typeof value.timezoneOffsetSeconds === "number" ? value.timezoneOffsetSeconds : 0
         });
-        this.deepSeekSignIn = true;
         return {
           status: "deepseek-sign-in-required",
           ...started.authorizeUrl === void 0 ? {} : { authorizeUrl: started.authorizeUrl }
@@ -26358,7 +26411,6 @@ var PluginControlRuntime = class {
         this.verifiedDeepSeekToken = session.token;
         this.verifiedDeepSeekAuthorization = authorization;
       }
-      this.deepSeekSignIn = void 0;
     } else {
       if (typeof value.email !== "string" || typeof value.password !== "string") {
         throw new ClientModeError("INVALID_MESSAGE", "Email and password are required for account authorization.");
@@ -26371,7 +26423,8 @@ var PluginControlRuntime = class {
     if (this.host !== void 0 && !hostPaused) {
       try {
         this.host.reconnectHost?.();
-      } catch {
+      } catch (error) {
+        console.error(`[dsh-remote] reconcile failed ${JSON.stringify({ code: String(error?.code ?? "") })}`);
       }
     }
     await this.settings.replace(editableConfig(next));
@@ -26471,14 +26524,13 @@ var PluginControlRuntime = class {
     await this.settings.replace(editableConfig({ ...current, acp: { enabled: current.acp?.enabled ?? true, backends } }));
     return this.settingsView();
   }
-  async logout() {
+  async logout(options = {}) {
     if (this.settings === void 0) {
       throw new ClientModeError("SETTINGS_UNAVAILABLE", "DSH user settings are unavailable in this profile.");
     }
     const config = resolveConfig(this.settings.get());
     this.verifiedDeepSeekToken = void 0;
     this.verifiedDeepSeekAuthorization = void 0;
-    this.deepSeekSignIn = void 0;
     if (config.serverUrl !== void 0) {
       await Promise.all([
         this.client?.clearClientAuthorization(),
@@ -26487,11 +26539,13 @@ var PluginControlRuntime = class {
       const directory = await ensureDeviceDirectory(this.identityDirectory, config.serverUrl);
       await new ServerCredentialStore(directory).clear();
     }
+    if (this.client !== void 0) this.client.hasDeepSeekSession = false;
     let deepseekSignedOut = false;
     if (this.deepseekSession !== void 0) {
       try {
-        deepseekSignedOut = await this.deepseekSession.signOut();
-      } catch {
+        deepseekSignedOut = options.releaseDeepSeek === false ? false : await this.deepseekSession.signOut();
+      } catch (error) {
+        console.error(`[dsh-remote] reconcile failed ${JSON.stringify({ code: String(error?.code ?? "") })}`);
         deepseekSignedOut = false;
       }
     }
@@ -26522,7 +26576,49 @@ var PluginControlRuntime = class {
     }
     return this.client === void 0 ? this.hostOnlyStatus() : await this.client.status();
   }
+  /** Consecutive reconciliations without a DSH session: DSH refreshes its grant, so one empty read is not a sign-out. */
+  /** Guards against re-entry through configure(), which reads the settings view back. */
+  reconcilingWithDeepSeek = false;
+  /**
+   * Keep this device's Server credentials in step with DSH's DeepSeek session - that session is the credential, and
+   * the Server verifies it before issuing this device its own tokens.
+   *
+   * Three cases: DSH signed in and this device not authorized -> authorize; DSH signed out and this device authorized
+   * -> sign out; otherwise nothing. At most once per ten seconds, from the settings poll the panel already makes.
+   */
+  async reconcileWithDeepSeek() {
+    if (this.deepseekSession === void 0 || this.reconcilingWithDeepSeek) return;
+    this.reconcilingWithDeepSeek = true;
+    try {
+      const session = await this.deepseekSession.read();
+      if (this.client !== void 0) this.client.hasDeepSeekSession = session !== void 0;
+      const authorized = this.client === void 0 ? false : await this.client.hasServerAuthorization();
+      console.error(`[dsh-remote] reconcile ${JSON.stringify({ hasSession: session !== void 0, authorized })}`);
+      if (session === void 0 && authorized) {
+        await this.logout({ releaseDeepSeek: false });
+        return;
+      }
+      if (session === void 0 || authorized) return;
+      if (this.client !== void 0) this.client.authorizingWithDeepSeek = true;
+      void (async () => {
+        try {
+          await this.configure({ provider: "deepseek", serverUrl: this.config.serverUrl });
+        } catch (error) {
+          console.error(`[dsh-remote] reconcile failed ${JSON.stringify({ code: String(error?.code ?? "") })}`);
+        } finally {
+          if (this.client !== void 0) this.client.authorizingWithDeepSeek = false;
+        }
+      })();
+    } finally {
+      this.reconcilingWithDeepSeek = false;
+    }
+  }
+  /**
+   * Keeps the reconciliation alive without the panel: DSH can be signed in or out while the card is closed, and the
+   * plugin has to follow. Only local reads - the exchange itself is throttled to one per ten seconds.
+   */
   async settingsView() {
+    await this.reconcileWithDeepSeek();
     const config = this.settings === void 0 ? editableConfig(this.config) : editableConfig(resolveConfig(this.settings.get()));
     const associations = await this.associations(config);
     const association = associations.host;
@@ -26661,13 +26757,6 @@ function redact(value, key = "") {
   return Object.fromEntries(Object.entries(value).map(([childKey, child]) => [childKey, redact(child, childKey)]));
 }
 
-// src/codex/session-id.ts
-function parseCodexSessionId(value) {
-  if (typeof value !== "string") return void 0;
-  const match = /^codex:([A-Za-z0-9][A-Za-z0-9._-]{0,255})$/.exec(value);
-  return match === null ? void 0 : { sessionId: value, threadId: match[1] };
-}
-
 // src/terminal-policy.ts
 var TERMINAL_CALLS = /* @__PURE__ */ new Set([
   "terminal/environment",
@@ -26681,6 +26770,7 @@ var TERMINAL_CALLS = /* @__PURE__ */ new Set([
 ]);
 var TERMINAL_STREAMS = /* @__PURE__ */ new Set(["terminal/follow", "terminal/retain"]);
 var id3 = external_exports.string().regex(/^[A-Za-z0-9_:-]{1,256}$/);
+var sessionKey = external_exports.string().regex(/^[A-Za-z0-9_:~-]{1,512}$/);
 var TerminalPolicy = class {
   constructor(enabled, deviceId, owners) {
     this.enabled = enabled;
@@ -26695,7 +26785,7 @@ var TerminalPolicy = class {
     );
     const args = external_exports.object({ args: external_exports.record(external_exports.unknown()) }).strict().parse(payload).args;
     const rawSessionId = args.agentId ?? args.sessionId;
-    const sessionId = id3.parse(rawSessionId);
+    const sessionId = sessionKey.parse(rawSessionId);
     const codexSession = parseCodexSessionId(sessionId);
     void codexSession;
     if (endpoint === "terminal/environment" || endpoint === "terminal/shells" || endpoint === "terminal/list") return {};