@blue-soda/dsh-remote 0.5.3 → 0.5.5

package/dist/index.js

@@ -13480,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
@@ -13516,7 +13521,7 @@ function normalizeServerUrl(value) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = "0.5.3";
+var PLUGIN_VERSION = "0.5.5";
 
 // src/server-api.ts
 var ENABLED_QR_PROVIDERS = ["github"];
@@ -14080,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),
@@ -14096,9 +14107,9 @@ 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") {
+        if (code === "DEVICE_REVOKED" || code === "AUTH_INVALID") {
           try {
             await this.api.clearAuthorization();
           } catch (clearError) {
@@ -14114,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;
@@ -14678,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(() => {
@@ -14693,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",
@@ -21909,10 +21920,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,
@@ -22075,11 +22092,33 @@ 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.");
-    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) {
@@ -22515,6 +22554,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" };
@@ -23227,7 +23282,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;
@@ -24951,12 +25025,24 @@ var CodexRemoteDomain = class {
         idempotencyKey: call.params.idempotencyKey
       }));
     }
+    if (isRecord12(call.params) && typeof call.params.threadId === "string") {
+      const rowKey = call.params.threadId;
+      const separator = rowKey.indexOf("~");
+      if (separator > 0) call.params.threadId = rowKey.slice(0, separator);
+    }
     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: authorized.data.map((row, index) => ({
+          ...row,
+          id: `${String(row.id)}~${String(row.createdAt ?? "")}~${index}`
+        }))
+      };
     }
     if (call.method === "thread/start") {
       const cwd = await this.requireCodexWorkspacePath(call.params.cwd);
@@ -26165,7 +26251,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(
@@ -26274,15 +26359,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 }
@@ -26295,7 +26378,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.");
@@ -26308,7 +26390,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));
@@ -26408,14 +26491,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(),
@@ -26424,11 +26506,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;
       }
     }
@@ -26459,7 +26543,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;
@@ -29994,7 +30120,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"}`,