coder
diff --git a/‎agent/agent.go
+12-1 b/‎agent/agent.go
+12-1
diff --git a/‎cli/root.go
+1-1 b/‎cli/root.go
+1-1
diff --git a/‎cli/ssh.go
+1-1 b/‎cli/ssh.go
+1-1
diff --git a/‎cli/vscodeipc.go
-88 b/‎cli/vscodeipc.go
-88
@@ -304,7 +304,18 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
 			if err != nil {
 				return
 			}
-			go a.sshServer.HandleConn(conn)
+			closed := make(chan struct{})
+			_ = a.trackConnGoroutine(func() {
+				select {
+				case <-network.Closed():
+				case <-closed:
+				}
+				_ = conn.Close()
+			})
+			_ = a.trackConnGoroutine(func() {
+				defer close(closed)
+				a.sshServer.HandleConn(conn)
+			})
 		}
 	}); err != nil {
 		return nil, err
 
@@ -97,7 +97,7 @@ func Core() []*cobra.Command {
 		update(),
 		users(),
 		versionCmd(),
-		vscodeipcCmd(),
+		vscodeSSH(),
 		workspaceAgent(),
 	}
 }
 
@@ -256,7 +256,7 @@ func getWorkspaceAndAgent(ctx context.Context, cmd *cobra.Command, client *coder
 	)
 	if shuffle {
 		res, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{
-			Owner: codersdk.Me,
+			Owner: userID,
 		})
 		if err != nil {
 			return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ func getWorkspaceAndAgent(ctx context.Context, cmd cobra.Command, client coder`
`256`	`256`	`)`
`257`	`257`	`if shuffle {`
`258`	`258`	`res, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{`
`259`		`- Owner: codersdk.Me,`
	`259`	`+ Owner: userID,`
`260`	`260`	`})`
`261`	`261`	`if err != nil {`
`262`	`262`	`return codersdk.Workspace{}, codersdk.WorkspaceAgent{}, err`