fix: NPE during error reporting

fioan89 · fioan89 · commit 837abb3d3526 · 2025-08-29T00:55:45.000+03:00
The try/catch block raised NPE in the `notify` if another exception was raised
after the context containing the URL was reset - so that means an error in the onConnect
handler. In addition, some of the reset steps were moved after onConnect to make sure they
execute only if onConnect callback is successful.

Because of the fault in how the steps were arranged, the original exception was never logged
instead a misleading NPE was treated by the coroutine's exception handler.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - improved diagnose support
 
+### Fixed
+
+- NPE during error reporting
+
 ## 0.6.3 - 2025-08-25
 
 ### Added
diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
@@ -409,7 +409,6 @@ class CoderRemoteProvider(
         context.logger.info("Displaying ${client.url} in the UI")
         pollJob = poll(client, cli)
         context.logger.info("Workspace poll job created with reference $pollJob")
-        context.envPageManager.showPluginEnvironmentsPage()
     }
 
     private fun MutableStateFlow<LoadableState<List<CoderRemoteEnvironment>>>.showLoadingMessage() {
diff --git a/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt b/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
@@ -73,6 +73,9 @@ class ConnectStep(
             errorField.textState.update { context.i18n.ptrl("Token is required") }
             return
         }
+        // Capture the host name early for error reporting
+        val hostName = CoderCliSetupContext.url!!.host
+
         signInJob?.cancel()
         signInJob = context.cs.launch(CoroutineName("Http and CLI Setup")) {
             try {
@@ -100,21 +103,23 @@ class ConnectStep(
                     yield()
                     cli.login(client.token!!)
                 }
-                logAndReportProgress("Successfully configured ${CoderCliSetupContext.url!!.host}...")
+                logAndReportProgress("Successfully configured ${hostName}...")
                 // allows interleaving with the back/cancel action
                 yield()
-                CoderCliSetupContext.reset()
-                CoderCliSetupWizardState.goToFirstStep()
                 context.logger.info("Connection setup done, initializing the workspace poller...")
                 onConnect(client, cli)
+
+                CoderCliSetupContext.reset()
+                CoderCliSetupWizardState.goToFirstStep()
+                context.envPageManager.showPluginEnvironmentsPage()
             } catch (ex: CancellationException) {
                 if (ex.message != USER_HIT_THE_BACK_BUTTON) {
-                    notify("Connection to ${CoderCliSetupContext.url!!.host} was configured", ex)
+                    notify("Connection to $hostName was configured", ex)
                     handleNavigation()
                     refreshWizard()
                 }
             } catch (ex: Exception) {
-                notify("Failed to configure ${CoderCliSetupContext.url!!.host}", ex)
+                notify("Failed to configure $hostName", ex)
                 handleNavigation()
                 refreshWizard()
             }

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,6 @@ class CoderRemoteProvider(`
`409`	`409`	`context.logger.info("Displaying ${client.url} in the UI")`
`410`	`410`	`pollJob = poll(client, cli)`
`411`	`411`	`context.logger.info("Workspace poll job created with reference $pollJob")`
`412`		`- context.envPageManager.showPluginEnvironmentsPage()`
`413`	`412`	`}`
`414`	`413`
`415`	`414`	`private fun MutableStateFlow<LoadableState<List<CoderRemoteEnvironment>>>.showLoadingMessage() {`