diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd7a3a2c37..35340a49eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@
 
 ### Changed
 
+- Prefix Coder output channel lines with the full session ID instead of a
+  shortened one, so it matches the ID the `coder` CLI, the agent and JetBrains
+  Toolbox log and a search for it finds the session everywhere.
 - API requests no longer read the `npm_config_proxy`, `npm_config_http_proxy`,
   `npm_config_https_proxy` and `npm_config_no_proxy` environment variables. Set
   `http.proxy`, `http.noProxy` or the standard `HTTP_PROXY`, `HTTPS_PROXY` and
diff --git a/src/container.ts b/src/container.ts
index 6c115db2f0..a1163c318b 100644
--- a/src/container.ts
+++ b/src/container.ts
@@ -5,7 +5,6 @@ import { CliManager } from "./cli/cliManager";
 import { watchConfigurationChanges } from "./configWatcher";
 import { AuthTelemetry } from "./instrumentation/auth";
 import { FlightRecorder } from "./logging/flightRecorder";
-import { shortId } from "./logging/ids";
 import { prefixLogger } from "./logging/prefixLogger";
 import { LoginCoordinator } from "./login/loginCoordinator";
 import { OAuthCallback } from "./oauth/oauthCallback";
@@ -60,7 +59,7 @@ export class ServiceContainer implements vscode.Disposable {
 		const readSize = () =>
 			readConnectionLogBufferSize(vscode.workspace.getConfiguration());
 		this.logger = new FlightRecorder(
-			prefixLogger(this.outputChannel, `[session ${shortId(sessionId)}]`),
+			prefixLogger(this.outputChannel, `[client_session_id=${sessionId}]`),
 			this.outputChannel,
 			readSize(),
 		);