@blue-soda/dsh-remote 0.5.2 → 0.5.4

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.2
+dsh plugin --profile web add -w @blue-soda/dsh-remote@0.5.4
 ```
 
 ### dsh-TUI Host
@@ -31,7 +31,7 @@ dsh plugin --profile web add -w @blue-soda/dsh-remote@0.5.2
 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.2
+dsh plugin --profile dsh-tui add -w @blue-soda/dsh-remote@0.5.4
 ```
 
 After starting dsh-TUI, manage Remote with `/remote`, `/remote login`, `/remote status`, and `/remote logout`.

package/dist/client.github.js

@@ -265,7 +265,7 @@
     reconnectingAction: "Reconnecting\u2026",
     reconnectStarted: "Reconnect requested.",
     connectionAuthorizationExpired: "Authorization expired. Sign in again to authorize this device.",
-    connectionReplaced: "Another instance is using this Host identity. Stop it or use a separate DSH_HOME before reconnecting.",
+    connectionReplaced: "Another instance is using this Host identity. Standing by: retrying every five minutes, and taking over as soon as it leaves.",
     connectionCredentialsBusy: "Credential refresh is locked. Stop other instances. After a crash, stop all instances before removing server-credentials.json.refresh-lock and authorizing again.",
     connectionDeviceRevoked: "This device was removed on the Server. Sign in again to add it back.",
     connectionOwnershipRequired: "The Server no longer recognizes this Host as an owned device.",
@@ -328,12 +328,12 @@
     exitRemote: "Exit",
     stopReconnecting: "Stop reconnecting",
     addRemoteWorkspace: "Add remote workspace",
-    addCodexWorkspace: "Add CodeX workspace",
-    noCodexWorkspaces: "No CodeX workspaces yet.",
+    addCodexWorkspace: "Add Codex workspace",
+    noCodexWorkspaces: "No Codex workspaces yet.",
     cancelAddWorkspace: "Cancel",
     confirmAddWorkspace: "Add and open",
     showAllWorkspaces: "Show all DSH workspaces",
-    showAllCodexWorkspaces: "Show all CodeX workspaces",
+    showAllCodexWorkspaces: "Show all Codex workspaces",
     remoteModeDsh: "Remote DSH \xB7 ",
     remoteModeCodex: "Remote Codex \xB7 ",
     remoteNetworkP2p: "P2P",
@@ -430,7 +430,7 @@
     accountPasswordLogin: "Password",
     qrLoginExpired: "This QR code expired. Refresh it to continue.",
     refreshQrCode: "Refresh QR code",
-    codexVirtualWorkspace: "CodeX virtual workspace",
+    codexVirtualWorkspace: "Codex virtual workspace",
     codexVirtualSessions: "Sessions"
   }, zh = {
     terminalRemote: "\u8FDC\u7A0B\u7EC8\u7AEF",
@@ -539,7 +539,7 @@
     reconnectingAction: "\u6B63\u5728\u91CD\u8FDE\u2026",
     reconnectStarted: "\u5DF2\u53D1\u8D77\u91CD\u8FDE\u3002",
     connectionAuthorizationExpired: "\u6388\u6743\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u4EE5\u91CD\u65B0\u6388\u6743\u6B64\u8BBE\u5907\u3002",
-    connectionReplaced: "\u53E6\u4E00\u5B9E\u4F8B\u6B63\u5728\u4F7F\u7528\u6B64 Host \u8EAB\u4EFD\u3002\u8BF7\u505C\u6B62\u8BE5\u5B9E\u4F8B\uFF0C\u6216\u4F7F\u7528\u72EC\u7ACB\u7684 DSH_HOME \u540E\u91CD\u65B0\u8FDE\u63A5\u3002",
+    connectionReplaced: "\u53E6\u4E00\u5B9E\u4F8B\u6B63\u5728\u4F7F\u7528\u6B64 Host \u8EAB\u4EFD\u3002\u672C\u673A\u5DF2\u8FDB\u5165\u5F85\u547D\uFF1A\u6BCF 5 \u5206\u949F\u91CD\u8BD5\u4E00\u6B21\uFF0C\u5BF9\u65B9\u9000\u51FA\u540E\u4F1A\u81EA\u52A8\u63A5\u7BA1\u3002",
     connectionCredentialsBusy: "\u51ED\u636E\u5237\u65B0\u88AB\u9501\u5B9A\uFF0C\u8BF7\u505C\u6B62\u5176\u4ED6\u5B9E\u4F8B\u3002\u82E5\u6B64\u524D\u5F02\u5E38\u9000\u51FA\uFF0C\u8BF7\u505C\u6B62\u6240\u6709\u5B9E\u4F8B\u540E\u79FB\u9664 server-credentials.json.refresh-lock \u5E76\u91CD\u65B0\u6388\u6743\u3002",
     connectionDeviceRevoked: "\u6B64\u8BBE\u5907\u5DF2\u5728 Server \u4E0A\u88AB\u79FB\u9664\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u4EE5\u91CD\u65B0\u6DFB\u52A0\u3002",
     connectionOwnershipRequired: "Server \u5DF2\u4E0D\u518D\u5C06\u6B64 Host \u8BC6\u522B\u4E3A\u5F53\u524D\u8D26\u53F7\u7684\u8BBE\u5907\u3002",
@@ -602,12 +602,12 @@
     exitRemote: "\u9000\u51FA",
     stopReconnecting: "\u505C\u6B62\u91CD\u8FDE",
     addRemoteWorkspace: "\u6DFB\u52A0\u8FDC\u7A0B\u5DE5\u4F5C\u533A",
-    addCodexWorkspace: "\u6DFB\u52A0 CodeX \u5DE5\u4F5C\u533A",
-    noCodexWorkspaces: "\u8FD8\u6CA1\u6709 CodeX \u5DE5\u4F5C\u533A\u3002",
+    addCodexWorkspace: "\u6DFB\u52A0 Codex \u5DE5\u4F5C\u533A",
+    noCodexWorkspaces: "\u8FD8\u6CA1\u6709 Codex \u5DE5\u4F5C\u533A\u3002",
     cancelAddWorkspace: "\u53D6\u6D88",
     confirmAddWorkspace: "\u786E\u8BA4\u5E76\u6253\u5F00",
     showAllWorkspaces: "\u663E\u793A\u5168\u90E8 DSH \u5DE5\u4F5C\u533A",
-    showAllCodexWorkspaces: "\u663E\u793A\u5168\u90E8 CodeX \u5DE5\u4F5C\u533A",
+    showAllCodexWorkspaces: "\u663E\u793A\u5168\u90E8 Codex \u5DE5\u4F5C\u533A",
     remoteModeDsh: "\u8FDC\u7A0BDSH \xB7 ",
     remoteModeCodex: "\u8FDC\u7A0BCodex \xB7 ",
     remoteNetworkP2p: "P2P",
@@ -704,7 +704,7 @@
     accountPasswordLogin: "\u8D26\u53F7\u5BC6\u7801",
     qrLoginExpired: "\u4E8C\u7EF4\u7801\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5\u3002",
     refreshQrCode: "\u5237\u65B0\u4E8C\u7EF4\u7801",
-    codexVirtualWorkspace: "CodeX \u5DE5\u4F5C\u533A",
+    codexVirtualWorkspace: "Codex \u5DE5\u4F5C\u533A",
     codexVirtualSessions: "Sessions"
   };
   function codexUnavailableKey(code) {
@@ -1514,7 +1514,12 @@
                   targetDeviceId: host.deviceId
                 }), codexReason, nextCodexWorkspaces = await props.control("codex.workspaces.list", {
                   targetDeviceId: host.deviceId
-                }).catch((reason) => (codexReason = remoteErrorMessage(reason, t), [])), nextStatus = await props.control("status").catch(() => {
+                }).catch(async (reason) => {
+                  let code = typeof reason?.code == "string" ? String(reason.code) : "";
+                  return ["TRANSPORT_CLOSED", "NOT_CONNECTED", "CONNECTION_FAILED", "RPC_TIMEOUT"].includes(code) ? await props.control("codex.workspaces.list", {
+                    targetDeviceId: host.deviceId
+                  }).catch((again) => (codexReason = remoteErrorMessage(again, t), [])) : (codexReason = remoteErrorMessage(reason, t), []);
+                }), nextStatus = await props.control("status").catch(() => {
                 });
                 return nextStatus !== void 0 && setStatus(nextStatus), setCodexNotice(codexReason), { workspaces: nextWorkspaces, codexWorkspaces: nextCodexWorkspaces, status: nextStatus };
               },
@@ -2219,7 +2224,7 @@
                 )
               ),
               notice === void 0 ? null : React.createElement("p", { className: "dshRemoteNotice", role: "status" }, notice),
-              error === void 0 ? null : React.createElement("p", { className: "dshRemoteError", role: "alert" }, error)
+              error === void 0 || error === codexNotice ? null : React.createElement("p", { className: "dshRemoteError", role: "alert" }, error)
             )
           )) : null
         );

package/dist/client.js

@@ -265,7 +265,7 @@
     reconnectingAction: "Reconnecting\u2026",
     reconnectStarted: "Reconnect requested.",
     connectionAuthorizationExpired: "Authorization expired. Sign in again to authorize this device.",
-    connectionReplaced: "Another instance is using this Host identity. Stop it or use a separate DSH_HOME before reconnecting.",
+    connectionReplaced: "Another instance is using this Host identity. Standing by: retrying every five minutes, and taking over as soon as it leaves.",
     connectionCredentialsBusy: "Credential refresh is locked. Stop other instances. After a crash, stop all instances before removing server-credentials.json.refresh-lock and authorizing again.",
     connectionDeviceRevoked: "This device was removed on the Server. Sign in again to add it back.",
     connectionOwnershipRequired: "The Server no longer recognizes this Host as an owned device.",
@@ -328,12 +328,12 @@
     exitRemote: "Exit",
     stopReconnecting: "Stop reconnecting",
     addRemoteWorkspace: "Add remote workspace",
-    addCodexWorkspace: "Add CodeX workspace",
-    noCodexWorkspaces: "No CodeX workspaces yet.",
+    addCodexWorkspace: "Add Codex workspace",
+    noCodexWorkspaces: "No Codex workspaces yet.",
     cancelAddWorkspace: "Cancel",
     confirmAddWorkspace: "Add and open",
     showAllWorkspaces: "Show all DSH workspaces",
-    showAllCodexWorkspaces: "Show all CodeX workspaces",
+    showAllCodexWorkspaces: "Show all Codex workspaces",
     remoteModeDsh: "Remote DSH \xB7 ",
     remoteModeCodex: "Remote Codex \xB7 ",
     remoteNetworkP2p: "P2P",
@@ -430,7 +430,7 @@
     accountPasswordLogin: "Password",
     qrLoginExpired: "This QR code expired. Refresh it to continue.",
     refreshQrCode: "Refresh QR code",
-    codexVirtualWorkspace: "CodeX virtual workspace",
+    codexVirtualWorkspace: "Codex virtual workspace",
     codexVirtualSessions: "Sessions"
   }, zh = {
     terminalRemote: "\u8FDC\u7A0B\u7EC8\u7AEF",
@@ -539,7 +539,7 @@
     reconnectingAction: "\u6B63\u5728\u91CD\u8FDE\u2026",
     reconnectStarted: "\u5DF2\u53D1\u8D77\u91CD\u8FDE\u3002",
     connectionAuthorizationExpired: "\u6388\u6743\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u4EE5\u91CD\u65B0\u6388\u6743\u6B64\u8BBE\u5907\u3002",
-    connectionReplaced: "\u53E6\u4E00\u5B9E\u4F8B\u6B63\u5728\u4F7F\u7528\u6B64 Host \u8EAB\u4EFD\u3002\u8BF7\u505C\u6B62\u8BE5\u5B9E\u4F8B\uFF0C\u6216\u4F7F\u7528\u72EC\u7ACB\u7684 DSH_HOME \u540E\u91CD\u65B0\u8FDE\u63A5\u3002",
+    connectionReplaced: "\u53E6\u4E00\u5B9E\u4F8B\u6B63\u5728\u4F7F\u7528\u6B64 Host \u8EAB\u4EFD\u3002\u672C\u673A\u5DF2\u8FDB\u5165\u5F85\u547D\uFF1A\u6BCF 5 \u5206\u949F\u91CD\u8BD5\u4E00\u6B21\uFF0C\u5BF9\u65B9\u9000\u51FA\u540E\u4F1A\u81EA\u52A8\u63A5\u7BA1\u3002",
     connectionCredentialsBusy: "\u51ED\u636E\u5237\u65B0\u88AB\u9501\u5B9A\uFF0C\u8BF7\u505C\u6B62\u5176\u4ED6\u5B9E\u4F8B\u3002\u82E5\u6B64\u524D\u5F02\u5E38\u9000\u51FA\uFF0C\u8BF7\u505C\u6B62\u6240\u6709\u5B9E\u4F8B\u540E\u79FB\u9664 server-credentials.json.refresh-lock \u5E76\u91CD\u65B0\u6388\u6743\u3002",
     connectionDeviceRevoked: "\u6B64\u8BBE\u5907\u5DF2\u5728 Server \u4E0A\u88AB\u79FB\u9664\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u4EE5\u91CD\u65B0\u6DFB\u52A0\u3002",
     connectionOwnershipRequired: "Server \u5DF2\u4E0D\u518D\u5C06\u6B64 Host \u8BC6\u522B\u4E3A\u5F53\u524D\u8D26\u53F7\u7684\u8BBE\u5907\u3002",
@@ -602,12 +602,12 @@
     exitRemote: "\u9000\u51FA",
     stopReconnecting: "\u505C\u6B62\u91CD\u8FDE",
     addRemoteWorkspace: "\u6DFB\u52A0\u8FDC\u7A0B\u5DE5\u4F5C\u533A",
-    addCodexWorkspace: "\u6DFB\u52A0 CodeX \u5DE5\u4F5C\u533A",
-    noCodexWorkspaces: "\u8FD8\u6CA1\u6709 CodeX \u5DE5\u4F5C\u533A\u3002",
+    addCodexWorkspace: "\u6DFB\u52A0 Codex \u5DE5\u4F5C\u533A",
+    noCodexWorkspaces: "\u8FD8\u6CA1\u6709 Codex \u5DE5\u4F5C\u533A\u3002",
     cancelAddWorkspace: "\u53D6\u6D88",
     confirmAddWorkspace: "\u786E\u8BA4\u5E76\u6253\u5F00",
     showAllWorkspaces: "\u663E\u793A\u5168\u90E8 DSH \u5DE5\u4F5C\u533A",
-    showAllCodexWorkspaces: "\u663E\u793A\u5168\u90E8 CodeX \u5DE5\u4F5C\u533A",
+    showAllCodexWorkspaces: "\u663E\u793A\u5168\u90E8 Codex \u5DE5\u4F5C\u533A",
     remoteModeDsh: "\u8FDC\u7A0BDSH \xB7 ",
     remoteModeCodex: "\u8FDC\u7A0BCodex \xB7 ",
     remoteNetworkP2p: "P2P",
@@ -704,7 +704,7 @@
     accountPasswordLogin: "\u8D26\u53F7\u5BC6\u7801",
     qrLoginExpired: "\u4E8C\u7EF4\u7801\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5\u3002",
     refreshQrCode: "\u5237\u65B0\u4E8C\u7EF4\u7801",
-    codexVirtualWorkspace: "CodeX \u5DE5\u4F5C\u533A",
+    codexVirtualWorkspace: "Codex \u5DE5\u4F5C\u533A",
     codexVirtualSessions: "Sessions"
   };
   function codexUnavailableKey(code) {
@@ -1514,7 +1514,12 @@
                   targetDeviceId: host.deviceId
                 }), codexReason, nextCodexWorkspaces = await props.control("codex.workspaces.list", {
                   targetDeviceId: host.deviceId
-                }).catch((reason) => (codexReason = remoteErrorMessage(reason, t), [])), nextStatus = await props.control("status").catch(() => {
+                }).catch(async (reason) => {
+                  let code = typeof reason?.code == "string" ? String(reason.code) : "";
+                  return ["TRANSPORT_CLOSED", "NOT_CONNECTED", "CONNECTION_FAILED", "RPC_TIMEOUT"].includes(code) ? await props.control("codex.workspaces.list", {
+                    targetDeviceId: host.deviceId
+                  }).catch((again) => (codexReason = remoteErrorMessage(again, t), [])) : (codexReason = remoteErrorMessage(reason, t), []);
+                }), nextStatus = await props.control("status").catch(() => {
                 });
                 return nextStatus !== void 0 && setStatus(nextStatus), setCodexNotice(codexReason), { workspaces: nextWorkspaces, codexWorkspaces: nextCodexWorkspaces, status: nextStatus };
               },
@@ -2219,7 +2224,7 @@
                 )
               ),
               notice === void 0 ? null : React.createElement("p", { className: "dshRemoteNotice", role: "status" }, notice),
-              error === void 0 ? null : React.createElement("p", { className: "dshRemoteError", role: "alert" }, error)
+              error === void 0 || error === codexNotice ? null : React.createElement("p", { className: "dshRemoteError", role: "alert" }, error)
             )
           )) : null
         );

package/dist/index.js

@@ -13162,7 +13162,7 @@ function fromBase64Url2(value) {
 import { platform } from "node:os";
 
 // src/server-credentials.ts
-import { chmod, mkdir, readFile, rm as rm2, stat as stat2, writeFile } from "node:fs/promises";
+import { chmod, mkdir, readFile, rename as rename2, rm as rm2, stat as stat2, writeFile } from "node:fs/promises";
 import { dirname, join as join2 } from "node:path";
 
 // src/atomic-file.ts
@@ -13237,6 +13237,11 @@ function uuidV7(now = Date.now()) {
 }
 
 // src/server-credentials.ts
+var LOCK_ABANDONED_MS = 10 * 6e4;
+var lockOwnerSchema = external_exports.object({
+  pid: external_exports.number().int().positive(),
+  at: external_exports.number().int().nonnegative()
+});
 var credentialSchema = external_exports.object({
   schemaVersion: external_exports.literal(1),
   serverUrl: external_exports.string().url(),
@@ -13254,8 +13259,13 @@ var ServerCredentialStore = class {
     this.path = join2(directory, "server-credentials.json");
   }
   /** Serialize the complete read/refresh/write transaction across processes.
-   * Never steal an old lock: a suspended owner may still consume a one-use token.
-   * After a crash, stop all instances before removing the orphaned lock.
+   *
+   * A lock left by a process that no longer exists can never be released by that process, and being killed
+   * mid-refresh is routine on a phone (the app is backgrounded or swept away) - the old rule then left the user
+   * with `SERVER_CREDENTIALS_BUSY` forever and told them to delete a file they cannot reach. So the lock now
+   * records its owner and a contender reclaims it when that owner is **gone**. Liveness is what is checked, not
+   * age: an owner that is merely suspended still protects its one-use refresh token, which is exactly what the
+   * old unconditional rule was guarding against.
    */
   async withRefreshLock(operation) {
     const lock = `${this.path}.refresh-lock`;
@@ -13263,10 +13273,11 @@ var ServerCredentialStore = class {
     const deadline = Date.now() + 15e3;
     for (; ; ) {
       try {
-        await mkdir(lock, { mode: 448 });
+        await claimRefreshLock(lock);
         break;
       } catch (error) {
         if (!(error instanceof Error) || !("code" in error) || error.code !== "EEXIST") throw error;
+        if (await reclaimAbandonedRefreshLock(lock)) continue;
         if (Date.now() >= deadline) throw new ServerCredentialsBusyError();
         await new Promise((resolve4) => setTimeout(resolve4, 50));
       }
@@ -13274,7 +13285,7 @@ var ServerCredentialStore = class {
     try {
       return await operation();
     } finally {
-      await rm2(lock, { recursive: true });
+      await rm2(lock, { recursive: true, force: true });
     }
   }
   async load(serverUrl, deviceId) {
@@ -13307,6 +13318,49 @@ var ServerCredentialsBusyError = class extends Error {
     super("Credential refresh is locked. Stop other instances; after a crash, stop all instances before removing server-credentials.json.refresh-lock and authorizing again.");
   }
 };
+async function claimRefreshLock(lock) {
+  await mkdir(lock, { mode: 448 });
+  await writeFile(join2(lock, "owner.json"), `${JSON.stringify({ pid: process.pid, at: Date.now() })}
+`, {
+    encoding: "utf8",
+    mode: 384
+  });
+}
+async function reclaimAbandonedRefreshLock(lock) {
+  const owner = await readRefreshLockOwner(lock);
+  const abandoned = owner === void 0 ? await olderThan(lock, LOCK_ABANDONED_MS) : !processAlive(owner.pid);
+  if (!abandoned) return false;
+  const tomb = `${lock}.${process.pid}.${uuidV7()}.abandoned`;
+  try {
+    await rename2(lock, tomb);
+  } catch {
+    return false;
+  }
+  await rm2(tomb, { recursive: true, force: true });
+  return true;
+}
+async function readRefreshLockOwner(lock) {
+  try {
+    return lockOwnerSchema.parse(JSON.parse(await readFile(join2(lock, "owner.json"), "utf8")));
+  } catch {
+    return void 0;
+  }
+}
+function processAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return !(error instanceof Error && "code" in error && error.code === "ESRCH");
+  }
+}
+async function olderThan(path, ageMs) {
+  try {
+    return Date.now() - (await stat2(path)).mtimeMs > ageMs;
+  } catch {
+    return false;
+  }
+}
 async function atomicWrite(path, contents) {
   const directory = dirname(path);
   await mkdir(directory, { recursive: true, mode: 448 });
@@ -13426,7 +13480,12 @@ function resolveConfig(input2 = {}, env = process.env) {
       enabled: parsed.reconnect !== false,
       initialDelayMs,
       maxDelayMs,
-      jitter: reconnect.jitter ?? 0.2
+      jitter: reconnect.jitter ?? 0.2,
+      // A displaced connection is a standby: another instance holds this device identity, so it waits five
+      // minutes - well outside the Server's 40-65 s reap window - and then tries again, taking over as soon
+      // as that instance leaves. Giving up for good is how the device stayed offline after the winner left.
+      // The fixture matrix needs a short interval to watch a standby take over, so an operator can override it.
+      replacedRetryMs: reconnect.replacedRetryMs ?? (Number.isFinite(Number(env.DSH_REMOTE_RECONNECT_REPLACED_RETRY_MS)) ? Number(env.DSH_REMOTE_RECONNECT_REPLACED_RETRY_MS) : 3e5)
     },
     codex: {
       // Off by default (2026-10-14). Carrying another agent's workspaces is a capability the user opts into, not
@@ -13462,7 +13521,7 @@ function normalizeServerUrl(value) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = "0.5.2";
+var PLUGIN_VERSION = "0.5.4";
 
 // src/server-api.ts
 var ENABLED_QR_PROVIDERS = ["github"];
@@ -14026,15 +14085,21 @@ var HostServerConnection = class {
   }
   async run() {
     let delayMs = this.config.reconnect.initialDelayMs;
+    let replacedRetryMs;
+    let replacedAttempts = 0;
     this.authRecoveryAttempted = false;
     while (!this.stopped) {
       try {
         await this.connectOnce();
         delayMs = this.config.reconnect.initialDelayMs;
+        replacedRetryMs = void 0;
+        replacedAttempts = 0;
       } catch (error) {
         const code = errorCode2(error);
         if (code === "CREDENTIALS_REFRESHED") continue;
         this.terminalError = code;
+        replacedRetryMs = code === "CONNECTION_REPLACED" ? replacedAttempts === 0 ? Math.min(this.config.reconnect.replacedRetryMs, REPLACED_FIRST_RETRY_MS) : this.config.reconnect.replacedRetryMs : void 0;
+        replacedAttempts = code === "CONNECTION_REPLACED" ? replacedAttempts + 1 : 0;
         this.logger.warn("server control connection failed", {
           code,
           retryable: isRetryable(error),
@@ -14042,7 +14107,7 @@ var HostServerConnection = class {
           ...connectionFailureDetail(error)
         });
         if (TERMINAL_AUTH_ERRORS.has(code)) {
-          this.logger.warn(code === "CONNECTION_REPLACED" ? "Another instance is using this Host identity. Stop it or use a separate DSH_HOME; automatic reconnect is paused." : 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.");
+          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") {
           try {
@@ -14060,7 +14125,7 @@ var HostServerConnection = class {
         continue;
       }
       if (!this.config.reconnect.enabled) return;
-      await this.waitBeforeRetry(delayMs);
+      await (replacedRetryMs === void 0 ? this.waitBeforeRetry(delayMs) : this.waitBeforeRetry(replacedRetryMs, true));
       if (this.reconnectRequested) {
         this.reconnectRequested = false;
         delayMs = this.config.reconnect.initialDelayMs;
@@ -14624,8 +14689,8 @@ var HostServerConnection = class {
       tunnel.noise.destroy();
     }
   }
-  waitBeforeRetry(baseDelay) {
-    const spread = baseDelay * this.config.reconnect.jitter;
+  waitBeforeRetry(baseDelay, exact = false) {
+    const spread = exact ? 0 : baseDelay * this.config.reconnect.jitter;
     const delay = Math.max(0, Math.round(baseDelay - spread + Math.random() * spread * 2));
     return new Promise((resolve4) => {
       const timer = setTimeout(() => {
@@ -14639,8 +14704,8 @@ var HostServerConnection = class {
     });
   }
 };
+var REPLACED_FIRST_RETRY_MS = 65e3;
 var TERMINAL_AUTH_ERRORS = /* @__PURE__ */ new Set([
-  "CONNECTION_REPLACED",
   "SERVER_CREDENTIALS_BUSY",
   "ACCOUNT_AUTH_REQUIRED",
   "AUTH_INVALID",
@@ -20291,8 +20356,12 @@ var TypertGatewaySwitch = class {
   installed = false;
   /** Defaults to reachable so a caller that never wires this keeps the old behaviour. */
   remoteAvailability = () => true;
-  constructor(gateway) {
+  /** Supplies the peer carrier calls speak for; see {@link ownerPeer}. */
+  peerFor;
+  peer;
+  constructor(gateway, options = {}) {
     this.runtime = gateway;
+    this.peerFor = options.peer;
     this.originalInvoke = gateway.invoke;
     this.localInvoke = this.originalInvoke.bind(gateway);
     this.originalStream = gateway.stream;
@@ -20300,18 +20369,42 @@ var TypertGatewaySwitch = class {
     this.originalDispatch = this.runtime.dispatchRpc;
     this.localDispatch = this.runtime.dispatchRpc?.bind(gateway);
     this.originalOpen = this.runtime.openWireStream;
-    this.localOpen = createLocalOpen(gateway, this.runtime);
+    this.localOpen = createLocalOpen(gateway, this.runtime, () => this.ownerPeer());
+  }
+  /**
+   * The peer a carrier call speaks for, created once and reused.
+   *
+   * dsh 0.2.1-rc.2 reads `peer.signal` on every carrier call and rejects one that arrives without a peer; a remote
+   * client runs with the Host owner's authority (decided 2026-10-19), which is the same principal dsh gives its own
+   * browser peer, so the plugin serves remote calls as the owner. Releases before rc.2 ignore the argument, and a
+   * profile without a `connection` service simply has no peer to offer.
+   */
+  ownerPeer() {
+    if (this.peer !== void 0) return this.peer;
+    this.peer = this.peerFor?.();
+    return this.peer;
+  }
+  /** Trailing argument the carrier wants when the caller did not supply one. */
+  peerArguments() {
+    const peer = this.ownerPeer();
+    return peer === void 0 ? [] : [peer];
   }
   /** Original local dispatcher, used by the Host bridge without switch recursion. */
   local() {
-    const dispatch = this.localDispatch ?? (async (endpoint, payload, signal) => {
+    const bare = this.localDispatch;
+    const dispatch = bare === void 0 ? (async (endpoint, payload, signal) => {
       try {
         const request = requestFromCarrier(endpoint, payload, signal);
         return { ok: true, value: await this.localInvoke(request) };
       } catch (error) {
         return { ok: false, error: this.failure(error) };
       }
-    });
+    }) : (endpoint, payload, signal, ...rest) => Promise.resolve(bare(
+      endpoint,
+      payload,
+      signal,
+      ...rest.length === 0 ? this.peerArguments() : rest
+    ));
     const open = this.localOpen ?? (async (endpoint, payload, signal) => {
       if (this.localStream === void 0) throw new Error("The local Harness Gateway does not support Remote streams.");
       return this.localStream(requestFromCarrier(endpoint, payload, signal));
@@ -20346,17 +20439,17 @@ var TypertGatewaySwitch = class {
       );
     }
     if (previousDispatch !== void 0) {
-      this.runtime.dispatchRpc = (endpoint, payload, signal) => forwards(endpoint) ? Promise.resolve(previousDispatch(endpoint, payload, signal)).catch((error) => {
+      this.runtime.dispatchRpc = (endpoint, payload, signal, ...rest) => forwards(endpoint) ? Promise.resolve(previousDispatch(endpoint, payload, signal, ...rest)).catch((error) => {
         console.warn("[dsh-remote] local call failed with no remote target selected", {
           endpoint,
           code: typeof error === "object" && error !== null && "code" in error ? String(error.code) : void 0,
           message: error instanceof Error ? error.message : String(error)
         });
         throw error;
-      }) : !this.routesToRemote(endpoint) ? this.localDispatch(endpoint, payload, signal) : this.withLocalFallback(
+      }) : !this.routesToRemote(endpoint) ? this.localDispatch(endpoint, payload, signal, ...rest) : this.withLocalFallback(
         endpoint,
         () => Promise.resolve(this.remoteTarget.dispatch(endpoint, payload, signal)),
-        () => this.localDispatch(endpoint, payload, signal)
+        () => this.localDispatch(endpoint, payload, signal, ...rest)
       ).then((result) => normalizeByteResult3(endpoint, result));
     }
     if (previousOpen !== void 0) {
@@ -20495,17 +20588,17 @@ function linkControl(signal) {
   else signal.addEventListener("abort", () => control.abort(signal.reason), { once: true });
   return control;
 }
-function createLocalOpen(gateway, runtime) {
+function createLocalOpen(gateway, runtime, peer = () => void 0) {
   const open = runtime.openWireStream;
   if (open !== void 0) {
-    return usesRc1Arity(open) ? (endpoint, payload, signal) => open.call(runtime, endpoint, payload, endedUplink(), void 0, signal, linkControl(signal)) : (endpoint, payload, signal) => open.call(runtime, endpoint, payload, signal);
+    return usesRc1Arity(open) ? (endpoint, payload, signal) => open.call(runtime, endpoint, payload, endedUplink(), peer(), signal, linkControl(signal)) : (endpoint, payload, signal) => open.call(runtime, endpoint, payload, signal);
   }
   const wire = gateway.wireStream;
   if (wire === void 0) return void 0;
   const wireOpen = wire.open;
   if (usesRc1Arity(wireOpen)) {
     const rc1 = wireOpen;
-    return (endpoint, payload, signal) => rc1.call(wire, endpoint, payload, endedUplink(), void 0, signal);
+    return (endpoint, payload, signal) => rc1.call(wire, endpoint, payload, endedUplink(), peer(), signal);
   }
   const legacy = wireOpen;
   return (endpoint, payload, signal) => legacy.call(wire, endpoint, payload, signal);
@@ -21673,7 +21766,7 @@ var QUICK_RECONNECT_RETRY_DELAY_MS = 5e3;
 var QUICK_RECONNECT_FORCE_RELAY = true;
 var BACKGROUND_RETRY_DELAYS_MS = [5e3, 1e4, 2e4, 3e4, 3e4, 3e4, 3e4];
 var ClientModeRuntime = class {
-  constructor(config, identities, server, apiProxy, typertGateway, logger, host, rtcFactoryProvider = loadNodeRtcFactory, targetStore) {
+  constructor(config, identities, server, apiProxy, typertGateway, logger, host, rtcFactoryProvider = loadNodeRtcFactory, targetStore, peer) {
     this.config = config;
     this.identities = identities;
     this.server = server;
@@ -21681,8 +21774,9 @@ var ClientModeRuntime = class {
     this.host = host;
     this.rtcFactoryProvider = rtcFactoryProvider;
     this.targetStore = targetStore;
+    this.peer = peer;
     this.proxySwitch = apiProxy === void 0 ? void 0 : new ApiProxySwitch(apiProxy);
-    this.gatewaySwitch = new TypertGatewaySwitch(typertGateway);
+    this.gatewaySwitch = new TypertGatewaySwitch(typertGateway, { peer: this.peer });
     this.gatewaySwitch.setRemoteAvailability(() => this.connected !== void 0);
   }
   preview;
@@ -21994,9 +22088,26 @@ var ClientModeRuntime = class {
   }
   async setHostAuthorization(enabled) {
     if (this.host === void 0) throw new ClientModeError("METHOD_NOT_ALLOWED", "This plugin is not running as a Host.");
-    await this.host.setHostControl?.(enabled);
-    if (enabled) await this.host.resumeHostConnection?.();
-    else await this.host.pauseHostConnection?.();
+    if (!enabled) {
+      await this.host.setHostControl?.(false);
+      await this.host.pauseHostConnection?.();
+      return this.status();
+    }
+    let flagError;
+    try {
+      await this.host.setHostControl?.(true);
+    } catch (error) {
+      flagError = error;
+    }
+    await this.host.resumeHostConnection?.();
+    try {
+      await this.host.setHostControl?.(true);
+    } catch (error) {
+      this.logger.warn("could not tell the Server that this Host accepts control; retrying when it reconnects", {
+        code: safeErrorCode(error),
+        ...flagError === void 0 ? {} : { firstCode: safeErrorCode(flagError) }
+      });
+    }
     return this.status();
   }
   async setMode(mode, targetDeviceId, signal) {
@@ -22432,6 +22543,22 @@ var ClientModeRuntime = class {
       return;
     }
     const transportLost = reason !== "codex-closed";
+    if (String(reason) === "CONNECTION_REPLACED" && this.reconnecting === void 0) {
+      const run = this.remoteReconnectRun;
+      this.reconnecting = { targetDeviceId, ...targetName === void 0 ? {} : { targetName }, phase: "fast" };
+      this.logger.info("the link was closed by this client's own connection replacement; retrying in place", {
+        targetDeviceId: shortId2(targetDeviceId),
+        kind
+      });
+      const rescued = await this.quickReconnectSession(targetDeviceId, target2, transportLost, run);
+      if (run !== this.remoteReconnectRun) return;
+      if (rescued) {
+        this.finishRecovery(targetDeviceId, "replacement", kind);
+        return;
+      }
+      void this.reconnectRemoteSession(targetDeviceId, target2);
+      return;
+    }
     if (this.reconnecting === void 0) {
       const run = this.remoteReconnectRun;
       this.reconnecting = { targetDeviceId, ...targetName === void 0 ? {} : { targetName }, phase: "fast" };
@@ -23144,7 +23271,26 @@ var ClientModeRuntime = class {
       throw error;
     }
   }
+  /**
+   * One attempt at a time per target: the panel's refresh and the automatic reconnect can ask at the same moment, and
+   * two control connections in flight make the Server close the older one with 4003 (`CONNECTION_REPLACED`), which
+   * also kills the link that was being built on it - what the user saw as being kicked out of the card.
+   */
+  inFlightConnect;
   async connect(targetDeviceId, signal, forceRelay = false) {
+    const key = `${targetDeviceId}|${forceRelay ? "relay" : "auto"}`;
+    const inFlight = this.inFlightConnect;
+    if (inFlight?.key === key) {
+      signal?.throwIfAborted();
+      return await inFlight.promise;
+    }
+    const promise = this.connectNow(targetDeviceId, signal, forceRelay).finally(() => {
+      if (this.inFlightConnect?.promise === promise) this.inFlightConnect = void 0;
+    });
+    this.inFlightConnect = { key, promise };
+    return await promise;
+  }
+  async connectNow(targetDeviceId, signal, forceRelay = false) {
     signal?.throwIfAborted();
     const progressRunId = this.connectionProgressRun + 1;
     this.connectionProgressRun = progressRunId;
@@ -29911,7 +30057,7 @@ function remoteStatusLines(target2) {
     `Authorization: ${status2.authorized ? status2.account === void 0 ? "logged in" : `logged in (${status2.account})` : "logged out"}`,
     `Server connection: ${connection}`,
     ...status2.error === void 0 ? [] : [`Connection error: ${status2.error}`],
-    ...status2.error === "CONNECTION_REPLACED" ? ["Another instance is using this Host identity. Stop it or use a separate DSH_HOME before reconnecting."] : status2.error === "SERVER_CREDENTIALS_BUSY" ? ["Credential refresh is locked. Stop all instances before removing an orphaned server-credentials.json.refresh-lock and authorizing again."] : status2.accountRequired ? ["Authorize again with /remote login [github|zhihu]."] : [],
+    ...status2.error === "CONNECTION_REPLACED" ? ["Another instance is using this Host identity. Standing by: retrying every five minutes, and taking over as soon as it leaves."] : status2.error === "SERVER_CREDENTIALS_BUSY" ? ["Credential refresh is locked. Stop all instances before removing an orphaned server-credentials.json.refresh-lock and authorizing again."] : status2.accountRequired ? ["Authorize again with /remote login [github|zhihu]."] : [],
     `Harness Remote API: ${capabilities.has("harness.api.v1") ? "available (ApiProxy)" : capabilities.has("harness.remote.v3") ? "available (Typert Remote Session V3)" : capabilities.has("harness.remote.v1") ? "available (Typert Remote)" : "unavailable"}`,
     `Remote clients: ${diagnostics.activeConnections}`,
     `Codex Remote: ${codex.enabled ? codex.state : "disabled"}`,
@@ -30269,8 +30415,18 @@ async function activate(ctx, readConfig, entryId, tuiBinding) {
   const deviceDirectory = config.serverUrl === void 0 ? defaultIdentityDirectory : await ensureDeviceDirectory(defaultIdentityDirectory, config.serverUrl);
   const hostIdentities = new IdentityStore({ directory: deviceDirectory });
   const apiProxy = ctx.get("apiProxy");
+  const connectionService = ctx.get("connection", false);
+  let ownerPeerResolved = false;
+  let ownerPeer;
+  const peerFor = () => {
+    if (!ownerPeerResolved) {
+      ownerPeerResolved = true;
+      ownerPeer = connectionService?.createPeer?.({ principal: { kind: "owner" } });
+    }
+    return ownerPeer;
+  };
   const nativeTypertGateway = ctx.get("typertGateway");
-  const localTypertGateway = new TypertGatewaySwitch(nativeTypertGateway).local();
+  const localTypertGateway = new TypertGatewaySwitch(nativeTypertGateway, { peer: peerFor }).local();
   const subprocess = ctx.get("subprocess", false);
   const deepseekAccount = ctx.get("deepseekAccount", false);
   const deepseekSession = deepseekAccount === void 0 ? void 0 : {
@@ -30319,7 +30475,8 @@ async function activate(ctx, readConfig, entryId, tuiBinding) {
       hostControl,
       // The RTC factory keeps its default; the target store lives beside the plugin state.
       void 0,
-      new ClientTargetStore(defaultIdentityDirectory)
+      new ClientTargetStore(defaultIdentityDirectory),
+      peerFor
     );
   }
   const controlRuntime = connection === void 0 ? void 0 : new PluginControlRuntime(config, defaultIdentityDirectory, settingsBinding, clientRuntime, hostControl, deepseekSession);