From acd4f227344d9972f515fea39b172a0949f6efe2 Mon Sep 17 00:00:00 2001
From: Faur Ioan-Aurel <fioan89@gmail.com>
Date: Wed, 23 Jul 2025 23:45:31 +0300
Subject: [PATCH 1/5] impl: enhanced workflow for network disruptions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, when the network connection drops, the Coder TBX plugin resets itself, redirects users to the authentication page, and terminates active SSH sessions to remote IDEs. This disrupts the user experience, forcing users to manually reconnect once the network is restored. Additionally, since the SSH session to the remote IDE is lost, the JBClient is unable to re-establish a connection with the remote backend.

This PR aims to improve that experience by adopting a behavior similar to the SSH plugin. Instead of clearing the list of workspaces or dropping existing SSH sessions during a network outage, we retain them. Once the network is restored, the plugin will automatically reinitialize the HTTP client and regenerate the SSH configuration—only if the number of workspaces has changed during the disconnection—without requiring user intervention.
---
 CHANGELOG.md                                         |  4 ++++
 .../kotlin/com/coder/toolbox/CoderRemoteProvider.kt  | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d161afe..3b6e569 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- improved workflow when network connection is flaky
+
 ## 0.5.2 - 2025-07-22
 
 ### Fixed
diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
index d68b077..ca68f65 100644
--- a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
+++ b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
@@ -166,17 +166,17 @@ class CoderRemoteProvider(
                     context.logger.error(ex, "workspace polling error encountered, trying to auto-login")
                     if (ex is APIResponseException && ex.isTokenExpired) {
                         WorkspaceConnectionManager.shouldEstablishWorkspaceConnections = true
+                        close()
+                        // force auto-login
+                        firstRun = true
+                        context.envPageManager.showPluginEnvironmentsPage()
+                        break
                     }
-                    close()
-                    // force auto-login
-                    firstRun = true
-                    context.envPageManager.showPluginEnvironmentsPage()
-                    break
                 }
             }
 
             // TODO: Listening on a web socket might be better?
-            select<Unit> {
+            select {
                 onTimeout(POLL_INTERVAL) {
                     context.logger.trace("workspace poller waked up by the $POLL_INTERVAL timeout")
                 }

From f255edbae3d45f5fca7b8e3ad58b26af916dc5d7 Mon Sep 17 00:00:00 2001
From: Faur Ioan-Aurel <fioan89@gmail.com>
Date: Wed, 23 Jul 2025 19:01:57 -0300
Subject: [PATCH 2/5] impl: persist last active SSH connections

Adds support for remembering SSH connections that were not manually disconnected by the user.
This allows the plugin to automatically restore those connections on the next startup
enabling remote IDEs that remained open to reconnect once the SSH link is re-established.
---
 .../coder/toolbox/CoderRemoteEnvironment.kt   | 19 ++++++++++++++-----
 .../toolbox/settings/ReadOnlyCoderSettings.kt |  5 +++++
 .../coder/toolbox/store/CoderSettingsStore.kt |  8 ++++++++
 .../com/coder/toolbox/store/StoreKeys.kt      |  2 ++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteEnvironment.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteEnvironment.kt
index 08f5a07..f8b3a17 100644
--- a/src/main/kotlin/com/coder/toolbox/CoderRemoteEnvironment.kt
+++ b/src/main/kotlin/com/coder/toolbox/CoderRemoteEnvironment.kt
@@ -68,6 +68,13 @@ class CoderRemoteEnvironment(
     private val proxyCommandHandle = SshCommandProcessHandle(context)
     private var pollJob: Job? = null
 
+    init {
+        if (context.settingsStore.shouldAutoConnect(id)) {
+            context.logger.info("resuming SSH connection to $id — last session was still active.")
+            startSshConnection()
+        }
+    }
+
     fun asPairOfWorkspaceAndAgent(): Pair<Workspace, WorkspaceAgent> = Pair(workspace, agent)
 
     private fun getAvailableActions(): List<ActionDescription> {
@@ -158,6 +165,7 @@ class CoderRemoteEnvironment(
     override fun beforeConnection() {
         context.logger.info("Connecting to $id...")
         isConnected.update { true }
+        context.settingsStore.updateAutoConnect(this.id, true)
         pollJob = pollNetworkMetrics()
     }
 
@@ -180,12 +188,9 @@ class CoderRemoteEnvironment(
             }
             context.logger.debug("Loading metrics from ${metricsFile.absolutePath} for $id")
             try {
-                val metrics = networkMetricsMarshaller.fromJson(metricsFile.readText())
-                if (metrics == null) {
-                    return@launch
-                }
+                val metrics = networkMetricsMarshaller.fromJson(metricsFile.readText()) ?: return@launch
                 context.logger.debug("$id metrics: $metrics")
-                additionalEnvironmentInformation.put(context.i18n.ptrl("Network Status"), metrics.toPretty())
+                additionalEnvironmentInformation[context.i18n.ptrl("Network Status")] = metrics.toPretty()
             } catch (e: Exception) {
                 context.logger.error(
                     e,
@@ -203,6 +208,10 @@ class CoderRemoteEnvironment(
         pollJob?.cancel()
         this.connectionRequest.update { false }
         isConnected.update { false }
+        if (isManual) {
+            // if the user manually disconnects the ssh connection we should not connect automatically
+            context.settingsStore.updateAutoConnect(this.id, false)
+        }
         context.logger.info("Disconnected from $id")
     }
 
diff --git a/src/main/kotlin/com/coder/toolbox/settings/ReadOnlyCoderSettings.kt b/src/main/kotlin/com/coder/toolbox/settings/ReadOnlyCoderSettings.kt
index a6d6143..693c1fd 100644
--- a/src/main/kotlin/com/coder/toolbox/settings/ReadOnlyCoderSettings.kt
+++ b/src/main/kotlin/com/coder/toolbox/settings/ReadOnlyCoderSettings.kt
@@ -146,6 +146,11 @@ interface ReadOnlyCoderSettings {
      * Return the URL and token from the config, if they exist.
      */
     fun readConfig(dir: Path): Pair<String?, String?>
+
+    /**
+     * Returns whether the SSH connection should be automatically established.
+     */
+    fun shouldAutoConnect(workspaceId: String): Boolean
 }
 
 /**
diff --git a/src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt b/src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt
index ff56380..0fa4914 100644
--- a/src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt
+++ b/src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt
@@ -142,6 +142,10 @@ class CoderSettingsStore(
                 }
     }
 
+    override fun shouldAutoConnect(workspaceId: String): Boolean {
+        return store["$SSH_AUTO_CONNECT_PREFIX$workspaceId"]?.toBooleanStrictOrNull() ?: false
+    }
+
     // a readonly cast
     fun readOnly(): ReadOnlyCoderSettings = this
 
@@ -213,6 +217,10 @@ class CoderSettingsStore(
         store[SSH_CONFIG_OPTIONS] = options
     }
 
+    fun updateAutoConnect(workspaceId: String, autoConnect: Boolean) {
+        store["$SSH_AUTO_CONNECT_PREFIX$workspaceId"] = autoConnect.toString()
+    }
+
     private fun getDefaultGlobalDataDir(): Path {
         return when (getOS()) {
             OS.WINDOWS -> Paths.get(env.get("LOCALAPPDATA"), "coder-toolbox")
diff --git a/src/main/kotlin/com/coder/toolbox/store/StoreKeys.kt b/src/main/kotlin/com/coder/toolbox/store/StoreKeys.kt
index 91e3b74..cd1a05d 100644
--- a/src/main/kotlin/com/coder/toolbox/store/StoreKeys.kt
+++ b/src/main/kotlin/com/coder/toolbox/store/StoreKeys.kt
@@ -42,3 +42,5 @@ internal const val SSH_CONFIG_OPTIONS = "sshConfigOptions"
 
 internal const val NETWORK_INFO_DIR = "networkInfoDir"
 
+internal const val SSH_AUTO_CONNECT_PREFIX = "ssh_auto_connect_"
+

From 3679ec46e81ee0547ace8e70b569e1145e92c646 Mon Sep 17 00:00:00 2001
From: Faur Ioan-Aurel <fioan89@gmail.com>
Date: Fri, 25 Jul 2025 00:12:21 +0300
Subject: [PATCH 3/5] impl: don't re-initialize the http session when waking up
 from sleep

---
 src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt | 4 +---
 src/main/kotlin/com/coder/toolbox/sdk/CoderRestClient.kt | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
index ca68f65..36746c6 100644
--- a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
+++ b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
@@ -160,8 +160,7 @@ class CoderRemoteProvider(
             } catch (ex: Exception) {
                 val elapsed = lastPollTime.elapsedNow()
                 if (elapsed > POLL_INTERVAL * 2) {
-                    context.logger.info("wake-up from an OS sleep was detected, going to re-initialize the http client...")
-                    client.setupSession()
+                    context.logger.info("wake-up from an OS sleep was detected")
                 } else {
                     context.logger.error(ex, "workspace polling error encountered, trying to auto-login")
                     if (ex is APIResponseException && ex.isTokenExpired) {
@@ -175,7 +174,6 @@ class CoderRemoteProvider(
                 }
             }
 
-            // TODO: Listening on a web socket might be better?
             select {
                 onTimeout(POLL_INTERVAL) {
                     context.logger.trace("workspace poller waked up by the $POLL_INTERVAL timeout")
diff --git a/src/main/kotlin/com/coder/toolbox/sdk/CoderRestClient.kt b/src/main/kotlin/com/coder/toolbox/sdk/CoderRestClient.kt
index e3a882f..1a0f18e 100644
--- a/src/main/kotlin/com/coder/toolbox/sdk/CoderRestClient.kt
+++ b/src/main/kotlin/com/coder/toolbox/sdk/CoderRestClient.kt
@@ -60,7 +60,7 @@ open class CoderRestClient(
         setupSession()
     }
 
-    fun setupSession() {
+    private fun setupSession() {
         moshi =
             Moshi.Builder()
                 .add(ArchConverter())

From d11599e484a4e4f8f5667a16239b5bc99941fa7a Mon Sep 17 00:00:00 2001
From: Faur Ioan-Aurel <fioan89@gmail.com>
Date: Fri, 25 Jul 2025 01:21:17 +0300
Subject: [PATCH 4/5] impl: simplify auto-login logic

Auto connect will now happen everytime at start up if there is a url and token available.
---
 .../com/coder/toolbox/CoderRemoteProvider.kt  | 40 +++++++++----------
 .../coder/toolbox/store/CoderSecretsStore.kt  |  5 +--
 .../com/coder/toolbox/views/ConnectStep.kt    |  1 -
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
index 36746c6..2e5d557 100644
--- a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
+++ b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
@@ -80,6 +80,8 @@ class CoderRemoteProvider(
         )
     )
 
+    private val errorBuffer = mutableListOf<Throwable>()
+
     /**
      * With the provided client, start polling for workspaces.  Every time a new
      * workspace is added, reconfigure SSH using the provided cli (including the
@@ -162,13 +164,12 @@ class CoderRemoteProvider(
                 if (elapsed > POLL_INTERVAL * 2) {
                     context.logger.info("wake-up from an OS sleep was detected")
                 } else {
-                    context.logger.error(ex, "workspace polling error encountered, trying to auto-login")
+                    context.logger.error(ex, "workspace polling error encountered")
                     if (ex is APIResponseException && ex.isTokenExpired) {
                         WorkspaceConnectionManager.shouldEstablishWorkspaceConnections = true
                         close()
-                        // force auto-login
-                        firstRun = true
                         context.envPageManager.showPluginEnvironmentsPage()
+                        errorBuffer.add(ex)
                         break
                     }
                 }
@@ -194,9 +195,6 @@ class CoderRemoteProvider(
      * first page.
      */
     private fun logout() {
-        // Keep the URL and token to make it easy to log back in, but set
-        // rememberMe to false so we do not try to automatically log in.
-        context.secrets.rememberMe = false
         WorkspaceConnectionManager.reset()
         close()
     }
@@ -358,22 +356,17 @@ class CoderRemoteProvider(
     override fun getOverrideUiPage(): UiPage? {
         // Show the setup page if we have not configured the client yet.
         if (client == null) {
-            val errorBuffer = mutableListOf<Throwable>()
             // When coming back to the application, initializeSession immediately.
-            val autoSetup = shouldDoAutoSetup()
-            context.secrets.lastToken.let { lastToken ->
-                context.secrets.lastDeploymentURL.let { lastDeploymentURL ->
-                    if (autoSetup && lastDeploymentURL.isNotBlank() && (lastToken.isNotBlank() || !settings.requireTokenAuth)) {
-                        try {
-                            CoderCliSetupWizardState.goToStep(WizardStep.CONNECT)
-                            return CoderCliSetupWizardPage(context, settingsPage, visibilityState, true, ::onConnect)
-                        } catch (ex: Exception) {
-                            errorBuffer.add(ex)
-                        }
-                    }
+            if (shouldDoAutoSetup()) {
+                try {
+                    CoderCliSetupWizardState.goToStep(WizardStep.CONNECT)
+                    return CoderCliSetupWizardPage(context, settingsPage, visibilityState, true, ::onConnect)
+                } catch (ex: Exception) {
+                    errorBuffer.add(ex)
+                } finally {
+                    firstRun = false
                 }
             }
-            firstRun = false
 
             // Login flow.
             val setupWizardPage =
@@ -382,21 +375,24 @@ class CoderRemoteProvider(
             errorBuffer.forEach {
                 setupWizardPage.notify("Error encountered", it)
             }
+            errorBuffer.clear()
             // and now reset the errors, otherwise we show it every time on the screen
             return setupWizardPage
         }
         return null
     }
 
-    private fun shouldDoAutoSetup(): Boolean = firstRun && context.secrets.rememberMe == true
+    /**
+     * Auto-login only on first the firs run if there is a url & token configured or the auth
+     * should be done via certificates.
+     */
+    private fun shouldDoAutoSetup(): Boolean = firstRun && (context.secrets.canAutoLogin || !settings.requireTokenAuth)
 
     private fun onConnect(client: CoderRestClient, cli: CoderCLIManager) {
         // Store the URL and token for use next time.
         context.secrets.lastDeploymentURL = client.url.toString()
         context.secrets.lastToken = client.token ?: ""
         context.secrets.storeTokenFor(client.url, context.secrets.lastToken)
-        // Currently we always remember, but this could be made an option.
-        context.secrets.rememberMe = true
         this.client = client
         pollJob?.cancel()
         environments.showLoadingMessage()
diff --git a/src/main/kotlin/com/coder/toolbox/store/CoderSecretsStore.kt b/src/main/kotlin/com/coder/toolbox/store/CoderSecretsStore.kt
index 3170a06..a807b69 100644
--- a/src/main/kotlin/com/coder/toolbox/store/CoderSecretsStore.kt
+++ b/src/main/kotlin/com/coder/toolbox/store/CoderSecretsStore.kt
@@ -24,9 +24,8 @@ class CoderSecretsStore(private val store: PluginSecretStore) {
     var lastToken: String
         get() = get("last-token")
         set(value) = set("last-token", value)
-    var rememberMe: Boolean
-        get() = get("remember-me").toBoolean()
-        set(value) = set("remember-me", value.toString())
+    val canAutoLogin: Boolean
+        get() = lastDeploymentURL.isNotBlank() && lastToken.isNotBlank()
 
     fun tokenFor(url: URL): String? = store[url.host]
 
diff --git a/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt b/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
index e01971c..7ea93e4 100644
--- a/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
+++ b/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
@@ -128,7 +128,6 @@ class ConnectStep(
             if (shouldAutoLogin.value) {
                 CoderCliSetupContext.reset()
                 CoderCliSetupWizardState.goToFirstStep()
-                context.secrets.rememberMe = false
             } else {
                 if (context.settingsStore.requireTokenAuth) {
                     CoderCliSetupWizardState.goToPreviousStep()

From 325e1dee39e8bfd3cc3b1c4c1c0ba45b348d320e Mon Sep 17 00:00:00 2001
From: Faur Ioan-Aurel <fioan89@gmail.com>
Date: Fri, 25 Jul 2025 01:22:38 +0300
Subject: [PATCH 5/5] chore: next version is 0.6.0

Reason for the major change: major changes in how we handle network disruptions
---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e6dc4d8..0becc24 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=0.5.2
+version=0.6.0
 group=com.coder.toolbox
-name=coder-toolbox
+name=coder-toolbox
\ No newline at end of file

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/coder/coder-jetbrains-toolbox/pull/162.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder-jetbrains-toolbox/pull/162.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder-jetbrains-toolbox/pull/162.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder-jetbrains-toolbox/pull/162.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>